Merge branch 'develop' of https://github.com/Combodo/iTop into develop

Basic color changes to identify different environments (tests, production, ...)

.editorconfig

@@ -11,7 +11,7 @@ ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
 ij_smart_tabs = false
-ij_visual_guides = 140
+ij_visual_guides = 80, 120, 140
 ij_wrap_on_typing = true
 
 [*.css]

.idea/codeStyles/Project.xml

@@ -67,11 +67,6 @@
         <option name="SMART_TABS" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="SCSS">
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="WRAP_ON_TYPING" value="1" />
     </codeStyleSettings>

.idea/inspectionProfiles/Combodo.xml

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

.jenkins/bin/init/debug.sh

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

.jenkins/bin/tests/phpunit.sh

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

.jenkins/bin/unattended_install/default_env.sh

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

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

@@ -80,7 +80,7 @@ $MySettings = array(
 
 	'db_host' => '',
 
-	'db_name' => 'itop_ci_main',
+	'db_name' => 'itop_ci',
 
 	'db_pwd' => 'IKnowYouSeeMeInJenkinsConf',
 
@@ -247,6 +247,9 @@ $MySettings = array(
  *
  */
 $MyModuleSettings = array(
+	'authent-local' => array (
+		'password_validation.pattern' => '',
+	),
 	'itop-attachments' => array (
 		'allowed_classes' => array (
 			0 => 'Ticket',

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

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

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

@@ -20,7 +20,6 @@
 //this scrit will be run under the ./toolkit directory, relatively to the document root
 
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/clipage.class.inc.php');
 require_once(APPROOT.'/core/config.class.inc.php');

.make/README.md

@@ -0,0 +1,6 @@
+= Make Doc =
+.make folder is meant to gather tools for releasing process. Maybe other new purposes will come as well....
+
+== license ==
+- updateLicenses.php: used to update community-licenses.xml easily based on composer.json files
+- sortLicenceXml.php: used to sort licenses based on scope + product name

.make/license/gen-community-license.sh

@@ -0,0 +1,84 @@
+#/bin/bash
+
+#git diff --name-status 2.6.2..HEAD js |grep   'A\sjs/' |awk -F/ '{printf("lib/%s/%s\n",$2,$3)}'|sort |uniq >/tmp/toto
+#git diff --name-status 2.6.2..HEAD lib |grep   'A\slib/' |awk -F/ '{printf("lib/%s/%s\n",$2,$3)}'|sort |uniq >/tmp/toto
+
+function HELP(){
+  echo "    Syntax: bash $0 /var/www/html/iTop"
+}
+
+if [ $# -eq 0 ]
+then
+	echo "no iTop path provided"
+  HELP
+	exit 1
+fi
+
+iTopPath=$1
+
+if [ ! -d $iTopPath ]
+then
+	echo "$iTopPath is not an iTop path."
+  HELP
+	exit 1
+fi
+
+echo "<?xml version=\"1.0\"?>
+<licenses>"
+
+for subfolder in lib datamodels
+do
+  for l in $(find $iTopPath/$subfolder/ -name composer.json|sed 's|/composer.json||')
+  do
+    if [ ! -d $l ]
+    then
+      continue
+    fi
+
+    dir=$(dirname $(dirname $l))
+    prod=$(echo $l| sed "s|$dir/||1")
+    echo $l $subfolder
+    lictype=$(cd $l && composer licenses --format json |jq .license[] |sed 's|\"||g')
+
+    authors=""
+    if [ -f $l/composer.json ]
+    then
+      author_nb=$(grep -c authors $l/composer.json|sed 's| ||g')
+      if [ "x$author_nb" != "x0" ]
+      then
+        OLDIFS=$IFS
+        IFS=$'\n'
+        for a in $(cat $l/composer.json |jq .authors[].name|sed 's|\"||g')
+        do
+          authors="$authors$a - "
+        done
+        authors="$authors#"
+        authors=$(echo $authors |sed 's| - #||')
+        IFS=$OLDIFS
+      fi
+    fi
+
+    lic=""
+    for licf in $(find $l -name LICEN*)
+    do
+      lic=$(cat $licf)
+      break
+    done
+
+    #if [ "x$lic" == "x" ]
+    #then
+    #	echo "============== no license found $l"
+    #fi
+
+    echo "    <license>
+          <product scope=\"$subfolder\">$prod</product>
+          <author>$authors</author>
+          <license_type>$lictype</license_type>
+          <text><![CDATA[
+  $lic
+  ]]></text>
+      </license>"
+  done
+done
+
+echo "</licenses>"

.make/license/sortLicenceXml.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * script used to sort license file (usefull for autogeneration)
+ * Example: 
+ */
+$iTopFolder = __DIR__ . "/../../" ;
+$xmlFilePath = $iTopFolder . "setup/licenses/community-licenses.xml";
+$dom = new DOMDocument();
+$dom->load($xmlFilePath);
+$xp = new DOMXPath($dom);
+
+$licenseList = $xp->query('/licenses/license');
+$licenses = iterator_to_array($licenseList);
+
+
+function get_scope($product_node)
+{
+	$scope = $product_node->getAttribute("scope");
+
+	if ($scope === "")
+	{   //put iTop first
+		return "aaaaaaaaa";
+	}
+	return $scope;
+}
+
+function get_product_node($license_node)
+{
+	foreach ($license_node->childNodes as $child)
+	{
+		if (is_a($child, 'DomElement') && $child->tagName === "product")
+		{
+			return $child;
+		}
+	}
+	return null;
+}
+
+function sort_by_product($a, $b)
+{
+	$aProductNode = get_product_node($a);
+	$bProductNode = get_product_node($b);
+
+	$res = strcmp(get_scope($aProductNode), get_scope($bProductNode));
+	if ($res !== 0)
+	{
+		return $res;
+	}
+	//sort on node product name
+    return strcmp($aProductNode->nodeValue, $bProductNode->nodeValue);
+}
+
+usort($licenses, 'sort_by_product');
+
+$newdom = new DOMDocument("1.0");
+$newdom->formatOutput = true;
+$root = $newdom->createElement("licenses");
+$newdom->appendChild($root);
+foreach ($licenses as $b) {
+    $node = $newdom->importNode($b,true);
+    $root->appendChild($newdom->importNode($b,true));
+}
+
+$newdom->save($xmlFilePath);

.make/license/updateLicenses.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * script used to sort license file (usefull for autogeneration)
+ * Example: php 
+ */
+
+$iTopFolder = __DIR__ . "/../../" ;
+$xmlFilePath = $iTopFolder . "setup/licenses/community-licenses.xml";
+
+function get_scope($product_node)
+{
+	$scope = $product_node->getAttribute("scope");
+
+	if ($scope === "")
+	{   //put iTop first
+		return "aaaaaaaaa";
+	}
+	return $scope;
+}
+
+function get_product_node($license_node)
+{
+	foreach ($license_node->childNodes as $child)
+	{
+		if (is_a($child, 'DomElement') && $child->tagName === "product")
+		{
+			return $child;
+		}
+	}
+	return null;
+}
+
+function sort_by_product($a, $b)
+{
+	$aProductNode = get_product_node($a);
+	$bProductNode = get_product_node($b);
+
+	$res = strcmp(get_scope($aProductNode), get_scope($bProductNode));
+	if ($res !== 0)
+	{
+		return $res;
+	}
+	//sort on node product name
+    return strcmp($aProductNode->nodeValue, $bProductNode->nodeValue);
+}
+
+function get_license_nodes($file_path)
+{
+	$dom = new DOMDocument();
+	$dom->load($file_path);
+	$xp = new DOMXPath($dom);
+
+	$licenseList = $xp->query('/licenses/license');
+	$licenses = iterator_to_array($licenseList);
+
+	usort($licenses, 'sort_by_product');
+	return $licenses;
+}
+
+$old_licenses = get_license_nodes($xmlFilePath);
+
+//generate file with updated licenses
+$generated_license_file_path = __DIR__."/provfile.xml";
+exec("bash " . __DIR__ . "/gen-community-license.sh $iTopFolder > ". $generated_license_file_path);
+$new_licenses = get_license_nodes($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" )
+	{
+		$new_licenses[] = $b;
+	}
+}
+
+usort($new_licenses, 'sort_by_product');
+
+$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);
+	$root->appendChild($new_dom->importNode($b,true));
+}
+
+$new_dom->save($xmlFilePath);

Jenkinsfile

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

README.md

@@ -51,6 +51,19 @@ iTop also offers mass import tools and web services to integrate with your IT
 
 ## Last releases
 
+### Versions 2.7.*
+ - 2.7.0-beta published on December 18, 2019
+ - [Changes since the previous version][62]
+ - [New features][63]
+ - [Migration notes][64]
+ - [Download iTop 2.7.0-beta][65]
+
+[62]: https://www.itophub.io/wiki/page?id=2_7_0:release:change_log
+[63]: https://www.itophub.io/wiki/page?id=2_7_0:release:2_7_whats_new
+[64]: https://www.itophub.io/wiki/page?id=2_7_0:install:260_to_270_migration_notes
+[65]: https://sourceforge.net/projects/itop/files/itop/2.7.0-beta
+
+
 ### Versions 2.6.*
  - 2.6.0 published on January 9, 2019
  - [Changes since the previous version][58]
@@ -112,6 +125,7 @@ We would like to give a special thank you to the people from the community who c
  - Casteleyn, Thomas
  - Castro, Randall Badilla
  - Colantoni, Maria Laura
+ - Couronné, Guy
  - Dvořák, Lukáš
  - Goethals, Stefan
  - Gumble, David
@@ -121,6 +135,7 @@ We would like to give a special thank you to the people from the community who c
  - Konečný, Kamil
  - Kunin, Vladimir
  - Lassiter, Dennis
+ - Lazcano, Federico
  - Lucas, Jonathan
  - Malik, Remie
  - Rosenke, Stephan
@@ -143,4 +158,5 @@ We would like to give a special thank you to the people from the community who c
 ### Companies
  - Hardis
  - ITOMIG
+ - Pimkie
 

addons/userrights/userrightsmatrix.class.inc.php

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

addons/userrights/userrightsprofile.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2013 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/>
-
 /**
- * UserRightsProfile
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 define('ADMIN_PROFILE_NAME', 'Administrator');
@@ -179,7 +172,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		parent::DisplayBareRelations($oPage, $bEditMode);
 		if (!$bEditMode)
 		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
 			$this->DoShowGrantSumary($oPage);
 		}
 	}
@@ -437,8 +430,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		CMDBObject::SetTrackInfo('Initialization');
 
-		$oChange = CMDBObject::GetCurrentChange();
-
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
 		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
@@ -446,7 +437,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
-			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			$iOrgId = $oOrg->DBInsertNoReload();
 
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
@@ -463,7 +454,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 					$oContact->Set('phone', '+00 000 000 000');
 				}
 				$oContact->Set('email', 'my.email@foo.org');
-				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+				$iContactId = $oContact->DBInsertNoReload();
 			}
 		}
 
@@ -482,14 +473,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		if (is_object($oAdminProfile))
 		{
 			$oUserProfile = new URP_UserProfile();
-			//$oUserProfile->Set('userid', $iUserId);
 			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
 			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$iUserId = $oUser->DBInsertNoReload();
 		return true;
 	}
 

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

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2013 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/>
-
 /**
- * UserRightsProfile
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 define('ADMIN_PROFILE_NAME', 'Administrator');
@@ -321,7 +314,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		parent::DisplayBareRelations($oPage, $bEditMode);
 		if (!$bEditMode)
 		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
 			$this->DoShowGrantSumary($oPage);		
 		}
 	}
@@ -533,10 +526,10 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
 	{
 		// Create a change to record the history of the User object
+		/** @var \CMDBChange $oChange */
 		$oChange = MetaModel::NewObject("CMDBChange");
 		$oChange->Set("date", time());
 		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
 
 		$iContactId = 0;
 		// Support drastic data model changes: no organization class (or not writable)!
@@ -545,7 +538,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
-			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			$oOrg::SetCurrentChange($oChange);
+			$iOrgId = $oOrg->DBInsertNoReload();
 
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
@@ -562,7 +556,8 @@ class UserRightsProfile extends UserRightsAddOnAPI
 					$oContact->Set('phone', '+00 000 000 000');
 				}
 				$oContact->Set('email', 'my.email@foo.org');
-				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+				$oContact::SetCurrentChange($oChange);
+				$iContactId = $oContact->DBInsertNoReload();
 			}
 		}
 
@@ -581,14 +576,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		if (is_object($oAdminProfile))
 		{
 			$oUserProfile = new URP_UserProfile();
-			//$oUserProfile->Set('userid', $iUserId);
 			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
 			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
 			$oSet = DBObjectSet::FromObject($oUserProfile);
 			$oUser->Set('profile_list', $oSet);
 		}
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$oUser::SetCurrentChange($oChange);
+		$iUserId = $oUser->DBInsertNoReload();
 		return true;
 	}
 

addons/userrights/userrightsprojection.class.inc.php

@@ -1,27 +1,20 @@
 <?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/>
-
 /**
- * UserRightsProjection
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsProfile, but enhanced with dimensions and projection of classes and profile over the dimensions) 
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 define('ADMIN_PROFILE_ID', 1);
@@ -153,7 +146,7 @@ class URP_Profiles extends UserRightsBaseClass
 		parent::DisplayBareRelations($oPage, $bEditMode);
 		if (!$bEditMode)
 		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
 			$this->DoShowGrantSumary($oPage);		
 		}
 	}
@@ -593,25 +586,12 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		$oChange = MetaModel::NewObject("CMDBChange");
 		$oChange->Set("date", time());
 		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
 
 		$oOrg = new Organization();
 		$oOrg->Set('name', 'My Company/Department');
 		$oOrg->Set('code', 'SOMECODE');
-//		$oOrg->Set('status', 'implementation');
-		//$oOrg->Set('parent_id', xxx);
-		$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip strong security */);
-
-		// Location : optional
-		//$oLocation = new bizLocation();
-		//$oLocation->Set('name', 'MyOffice');
-		//$oLocation->Set('status', 'implementation');
-		//$oLocation->Set('org_id', $iOrgId);
-		//$oLocation->Set('severity', 'high');
-		//$oLocation->Set('address', 'my building in my city');
-		//$oLocation->Set('country', 'my country');
-		//$oLocation->Set('parent_location_id', xxx);
-		//$iLocationId = $oLocation->DBInsertNoReload();
+		$oOrg::SetCurrentChange($oChange);
+		$iOrgId = $oOrg->DBInsertNoReload();
 
 		$oContact = new Person();
 		$oContact->Set('name', 'My last name');
@@ -619,24 +599,24 @@ class UserRightsProjection extends UserRightsAddOnAPI
 		//$oContact->Set('status', 'available');
 		$oContact->Set('org_id', $iOrgId);
 		$oContact->Set('email', 'my.email@foo.org');
-		//$oContact->Set('phone', '');
-		//$oContact->Set('location_id', $iLocationId);
-		//$oContact->Set('employee_number', '');
-		$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$oContact::SetCurrentChange($oChange);
+		$iContactId = $oContact->DBInsertNoReload();
 		
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
 		$oUser->Set('contactid', $iContactId);
 		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$oUser::SetCurrentChange($oChange);
+		$iUserId = $oUser->DBInsertNoReload();
 		
 		// Add this user to the very specific 'admin' profile
 		$oUserProfile = new URP_UserProfile();
 		$oUserProfile->Set('userid', $iUserId);
 		$oUserProfile->Set('profileid', ADMIN_PROFILE_ID);
 		$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-		$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$oUserProfile::SetCurrentChange($oChange);
+		$oUserProfile->DBInsertNoReload();
 		return true;
 	}
 

application/ajaxwebpage.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2018 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, header or fancy formatting, useful to
- * generate HTML fragments when called by an AJAX method
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT."/application/webpage.class.inc.php");
@@ -30,7 +23,7 @@ class ajax_page extends WebPage implements iTabbedPage
 {
     /**
      * Jquery style ready script
-     * @var Hash     
+     * @var array
      */	  
 	protected $m_sReadyScript;
 	protected $m_oTabs;
@@ -57,56 +50,67 @@ class ajax_page extends WebPage implements iTabbedPage
 		utils::InitArchiveMode();
     }
 
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
 		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
 	}
 
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
+	public function AddToTab($sTabContainer, $sTabCode, $sHtml)
 	{
-		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabCode, $sHtml));
 	}
 
+	/**
+	 * @inheritDoc
+	 */
 	public function SetCurrentTabContainer($sTabContainer = '')
 	{
 		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
 	}
 
-	public function SetCurrentTab($sTabLabel = '')
-	{
-		return $this->m_oTabs->SetCurrentTab($sTabLabel);
-	}
-	
 	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 * 
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
-	 * Static content cannot be added inside such tabs.
-	 * 
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
-	 * @since 2.0.3
+	 * @inheritDoc
 	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	public function SetCurrentTab($sTabCode = '', $sTabTitle = null)
 	{
-		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+		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();
 	}
 
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	/**
+	 * @inheritDoc
+	 */
+	public function RemoveTab($sTabCode, $sTabContainer = null)
 	{
-		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+		$this->m_oTabs->RemoveTab($sTabCode, $sTabContainer);
 	}
 
 	/**
-	 * Finds the tab whose title matches a given pattern
-	 * @return mixed The name of the tab as a string or false if not found
+	 * @inheritDoc
 	 */
 	public function FindTab($sPattern, $sTabContainer = null)
 	{
@@ -119,21 +123,23 @@ class ajax_page extends WebPage implements iTabbedPage
 	 * that we are using this is not supported... TO DO upgrade
 	 * the whole jquery bundle...
 	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
+	public function SelectTab($sTabContainer, $sTabCode)
 	{
-		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
 	}
-	
+
+	/**
+	 * @param string $sHtml
+	 */
 	public function AddToMenu($sHtml)
 	{
 		$this->m_sMenu .= $sHtml;
 	}
 
-    /**
-     * Echoes the content of the whole page
-     * @return void
-     */	  
-    public function output()
+	/**
+	 * @inheritDoc
+	 */
+	public function output()
     {
     	if (!empty($this->sContentType))
     	{
@@ -216,8 +222,9 @@ EOF
 		}
 	    $this->outputCollapsibleSectionInit();
 
+	    $oKPI = new ExecutionKPI();
 	    $s_captured_output = $this->ob_get_clean_safe();
-		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
+	    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);
@@ -287,6 +294,8 @@ EOF
         	echo self::FilterXSS($s_captured_output);
         }
 
+	    $oKPI->ComputeAndReport('Echoing');
+
         if (class_exists('DBSearch'))
         {
             DBSearch::RecordQueryTrace();
@@ -307,7 +316,11 @@ EOF
     {
 	}
 
-    public function add($sHtml)
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
+	public function add($sHtml)
     {
         if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
         {
@@ -320,10 +333,9 @@ EOF
     }
 
 	/**
-	 * Records the current state of the 'html' part of the page output
-	 * @return mixed The current state of the 'html' output
-	 */    
-    public function start_capture()
+	 * @inheritDoc
+	 */
+	public function start_capture()
     {
     	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
 		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
@@ -339,13 +351,10 @@ EOF
 		}
     }
 
-    /**
-     * Returns the part of the html output that occurred since the call to start_capture
-     * and removes this part from the current html output
-     * @param $offset mixed The value returned by start_capture
-     * @return string The part of the html output that was added since the call to start_capture
-     */    
-    public function end_capture($offset)
+	/**
+	 * @inheritDoc
+	 */
+	public function end_capture($offset)
     {
 		if (is_array($offset))
 		{
@@ -366,11 +375,9 @@ EOF
     }
 
 	/**
-	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
-	 * This is useful to add hidden content, DIVs or FORMs that should not
-	 * be embedded into each other.	 	 
+	 * @inheritDoc
 	 */
-    public function add_at_the_end($s_html, $sId = '')
+	public function add_at_the_end($s_html, $sId = '')
     {
     	if ($sId != '')
     	{
@@ -378,27 +385,27 @@ EOF
     	}
         $this->s_deferred_content .= $s_html;
     }
-	
+
 	/**
-	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
-	 * NOT implemented in this version of the class.
-	 * @return void	 
-	 */	 	 	
+	 * @inheritDoc
+	 */
 	public function add_ready_script($sScript)
 	{
 		$this->m_sReadyScript .= $sScript."\n";
 	}
-	
+
 	/**
-	 * Cannot be called in this context, since Ajax pages do not share
-	 * any context with the calling page !!
+	 * @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/applicationextension.inc.php

@@ -16,6 +16,8 @@
 //   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 Symfony\Component\DependencyInjection\Container;
+
 require_once(APPROOT.'application/newsroomprovider.class.inc.php');
 
 /**
@@ -178,12 +180,12 @@ interface iLogoutExtension extends iLoginExtension
 	public function LogoutAction();
 }
 
-interface iLoginDataExtension extends iLoginExtension
+interface iLoginUIExtension extends iLoginExtension
 {
 	/**
-	 * @return LoginTwigData
+	 * @return LoginTwigContext
 	 */
-	public function GetLoginData();
+	public function GetTwigContext();
 }
 
 
@@ -419,7 +421,7 @@ interface iApplicationObjectExtension
 	 * Invoked when an object is updated into the database. The method is called right <b>after</b> the object has been written to the
 	 * database.
 	 *
-	 * Changes made to the object can be get using {@link \cmdbAbstractObject::$m_aChanges}
+	 * Changes made to the object can be get using {@link $oObject::ListChangesUpdated()}. Do not call {@link \DBObject::ListChanges} for this purpose because it will be empty as the object has already be written to DB!
 	 *
 	 * @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
@@ -427,7 +429,7 @@ interface iApplicationObjectExtension
 	 *
 	 * @return void
 	 *
-	 * @since 2.7.0 N°2293 can access object changes by calling {@link \cmdbAbstractObject::$m_aChanges}
+	 * @since 2.7.0 N°2293 can access object changes by calling {@link $oObject::ListChangesUpdated()}
 	 */
 	public function OnDBUpdate($oObject, $oChange = null);
 
@@ -864,65 +866,65 @@ interface iPortalUIExtension
 	/**
 	 * Returns an array of CSS file urls
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return array
 	 */
-	public function GetCSSFiles(\Silex\Application $oApp);
+	public function GetCSSFiles(Container $oContainer);
 
 	/**
 	 * Returns inline (raw) CSS
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
 	 */
-	public function GetCSSInline(\Silex\Application $oApp);
+	public function GetCSSInline(Container $oContainer);
 
 	/**
 	 * Returns an array of JS file urls
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return array
 	 */
-	public function GetJSFiles(\Silex\Application $oApp);
+	public function GetJSFiles(Container $oContainer);
 
 	/**
 	 * Returns raw JS code
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
 	 */
-	public function GetJSInline(\Silex\Application $oApp);
+	public function GetJSInline(Container $oContainer);
 
 	/**
 	 * Returns raw HTML code to put at the end of the <body> tag
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
 	 */
-	public function GetBodyHTML(\Silex\Application $oApp);
+	public function GetBodyHTML(Container $oContainer);
 
 	/**
 	 * Returns raw HTML code to put at the end of the #main-wrapper element
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
 	 */
-	public function GetMainContentHTML(\Silex\Application $oApp);
+	public function GetMainContentHTML(Container $oContainer);
 
 	/**
 	 * Returns raw HTML code to put at the end of the #topbar and #sidebar elements
 	 *
-	 * @param \Silex\Application $oApp
+	 * @param \Symfony\Component\DependencyInjection\Container $oContainer
 	 *
 	 * @return string
 	 */
-	public function GetNavigationMenuHTML(\Silex\Application $oApp);
+	public function GetNavigationMenuHTML(Container $oContainer);
 }
 
 /**
@@ -933,7 +935,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetCSSFiles(\Silex\Application $oApp)
+	public function GetCSSFiles(Container $oContainer)
 	{
 		return array();
 	}
@@ -941,7 +943,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetCSSInline(\Silex\Application $oApp)
+	public function GetCSSInline(Container $oContainer)
 	{
 		return null;
 	}
@@ -949,7 +951,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetJSFiles(\Silex\Application $oApp)
+	public function GetJSFiles(Container $oContainer)
 	{
 		return array();
 	}
@@ -957,7 +959,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetJSInline(\Silex\Application $oApp)
+	public function GetJSInline(Container $oContainer)
 	{
 		return null;
 	}
@@ -965,7 +967,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetBodyHTML(\Silex\Application $oApp)
+	public function GetBodyHTML(Container $oContainer)
 	{
 		return null;
 	}
@@ -973,7 +975,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetMainContentHTML(\Silex\Application $oApp)
+	public function GetMainContentHTML(Container $oContainer)
 	{
 		return null;
 	}
@@ -981,7 +983,7 @@ abstract class AbstractPortalUIExtension implements iPortalUIExtension
 	/**
 	 * @inheritDoc
 	 */
-	public function GetNavigationMenuHTML(\Silex\Application $oApp)
+	public function GetNavigationMenuHTML(Container $oContainer)
 	{
 		return null;
 	}
@@ -1528,3 +1530,16 @@ class RestUtils
 		return $oObject;
 	}
 }
+
+
+/**
+ * Helpers for modules extensibility, with discover performed by the MetaModel.
+ *
+ *
+ * @api
+ * @package     Extensibility
+ */
+interface iModuleExtension
+{
+	public function __construct();
+}

application/cmdbabstract.class.inc.php

@@ -1,28 +1,20 @@
 <?php
-// Copyright (C) 2010-2018 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/>
-
-
 /**
- * Abstract class that implements some common and useful methods for displaying
- * the objects
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 define('OBJECT_PROPERTIES_TAB', 'ObjectProperties');
@@ -51,8 +43,20 @@ require_once(APPROOT.'sources/application/search/criterionconversionabstract.cla
 require_once(APPROOT.'sources/application/search/criterionconversion/criteriontooql.class.inc.php');
 require_once(APPROOT.'sources/application/search/criterionconversion/criteriontosearchform.class.inc.php');
 
+/**
+ * Class cmdbAbstractObject
+ */
 abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 {
+	/** @var string ENUM_OBJECT_MODE_VIEW */
+	const ENUM_OBJECT_MODE_VIEW = 'view';
+	/** @var string ENUM_OBJECT_MODE_EDIT */
+	const ENUM_OBJECT_MODE_EDIT = 'edit';
+	/** @var string ENUM_OBJECT_MODE_CREATE */
+	const ENUM_OBJECT_MODE_CREATE = 'create';
+	/** @var string ENUM_OBJECT_MODE_STIMULUS */
+	const ENUM_OBJECT_MODE_STIMULUS = 'stimulus';
+
 	protected $m_iFormId; // The ID of the form used to edit the object (when in edition mode !)
 	protected static $iGlobalFormId = 1;
 	protected $aFieldsMap;
@@ -63,6 +67,10 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	 * @var bool
 	 */
 	protected $bAllowWrite;
+	/**
+	 * @var bool
+	 */
+	protected $bAllowDelete;
 
 	/**
 	 * Constructor from a row of data (as a hash 'attcode' => value)
@@ -71,11 +79,14 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	 * @param string $sClassAlias
 	 * @param array $aAttToLoad
 	 * @param array $aExtendedDataSpec
+	 *
+	 * @throws \CoreException
 	 */
 	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
 	{
 		parent::__construct($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
 		$this->bAllowWrite = false;
+		$this->bAllowDelete = false;
 	}
 
 	/**
@@ -91,6 +102,13 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		return 'UI.php';
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \DBObject $oObj
+	 * @param array $aParams
+	 *
+	 * @throws \Exception
+	 */
 	public static function ReloadAndDisplay($oPage, $oObj, $aParams)
 	{
 		$oAppContext = new ApplicationContext();
@@ -143,7 +161,7 @@ EOF
 	}
 
 	/**
-	 * Set a message diplayed to the end-user next time this object will be displayed
+	 * Set a message displayed to the end-user next time this object will be displayed
 	 * Messages are uniquely identified so that plugins can override standard messages (the final work is given to the
 	 * last plugin to set the message for a given message id) In practice, standard messages are recorded at the end
 	 * but they will not overwrite existing messages
@@ -176,6 +194,18 @@ EOF
 		}
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param bool $bEditMode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 */
 	public function DisplayBareHeader(WebPage $oPage, $bEditMode = false)
 	{
 		// Standard Header with name, actions menu and history block
@@ -367,6 +397,16 @@ EOF
 		);
 	}
 
+	/**
+	 * Display history tab of an object
+	 *
+	 * @param \WebPage $oPage
+	 * @param bool $bEditMode
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 *
+	 * @throws \CoreException
+	 */
 	public function DisplayBareHistory(WebPage $oPage, $bEditMode = false, $iLimitCount = 0, $iLimitStart = 0)
 	{
 		// history block (with as a tab)
@@ -378,6 +418,17 @@ EOF
 		$oBlock->Display($oPage, 'history');
 	}
 
+	/**
+	 * Display properties tab of an object
+	 *
+	 * @param \WebPage $oPage
+	 * @param bool $bEditMode
+	 * @param string $sPrefix
+	 * @param array $aExtraParams
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 */
 	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
 		$aFieldsMap = $this->GetBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
@@ -419,7 +470,7 @@ EOF
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @throws \Exception
@@ -460,6 +511,7 @@ EOF
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 * @throws \OQLException
+	 * @throws \Exception
 	 */
 	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
@@ -483,7 +535,7 @@ EOF
 				{
 					continue;
 				}
-				$oPage->AddAjaxTab($oAttDef->GetLabel(), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode());
+				$oPage->AddAjaxTab($oAttDef->GetLabel(), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode(), true, 'Class:'.$sClass.'/Attribute:'.$sAttCode);
 				continue;
 			}
 
@@ -505,7 +557,7 @@ EOF
 			{
 				$sCount = " ($iCount)";
 			}
-			$oPage->SetCurrentTab($oAttDef->GetLabel().$sCount);
+			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
 			if ($this->IsNew())
 			{
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
@@ -684,9 +736,9 @@ EOF
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array());
 					$iNotifsCount += $oNotifSet->Count();
 				}
-				// Display notifications regarding the object: on block per subclass to have the intersting columns
+				// Display notifications regarding the object: on block per subclass to have the interesting columns
 				$sCount = ($iNotifsCount > 0) ? ' ('.$iNotifsCount.')' : '';
-				$oPage->SetCurrentTab(Dict::S('UI:NotificationsTab').$sCount);
+				$oPage->SetCurrentTab('UI:NotificationsTab', Dict::S('UI:NotificationsTab').$sCount);
 
 				foreach($aNotificationClasses as $sNotifClass)
 				{
@@ -698,6 +750,21 @@ EOF
 		}
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param bool $bEditMode
+	 * @param string $sPrefix
+	 * @param array $aExtraParams
+	 *
+	 * @return array
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 */
 	public function GetBareProperties(WebPage $oPage, $bEditMode, $sPrefix, $aExtraParams = array())
 	{
 		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
@@ -735,7 +802,7 @@ EOF
 				$aTableClasses[] = 'one-col-details';
 			}
 
-			$oPage->SetCurrentTab(Dict::S($sTab));
+			$oPage->SetCurrentTab($sTab);
 			$oPage->add('<table style="'.implode('; ', $aTableStyles).'" class="'.implode(' ',
 					$aTableClasses).'" data-mode="'.$sEditMode.'"><tr>');
 			foreach($aCols as $sColIndex => $aFieldsets)
@@ -770,6 +837,10 @@ EOF
 					}
 					foreach($aFields as $sAttCode)
 					{
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+						$sAttDefClass = get_class($oAttDef);
+						$sAttLabel = MetaModel::GetLabel($sClass, $sAttCode);
+
 						if ($bEditMode)
 						{
 							$sComments = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
@@ -780,7 +851,6 @@ EOF
 								// the caller may override some flags if needed
 								$iFlags = $iFlags | $aExtraFlags[$sAttCode];
 							}
-							$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 							if ((!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0) && !($oAttDef instanceof AttributeDashboard))
 							{
 								$sInputId = $this->m_iFormId.'_'.$sAttCode;
@@ -795,7 +865,6 @@ EOF
 											'value' => $sHTMLValue,
 											'comments' => $sComments,
 											'infos' => $sInfos,
-											'attcode' => $sAttCode,
 										);
 									}
 									else
@@ -842,7 +911,6 @@ EOF
 											'value' => $sHTMLValue,
 											'comments' => $sComments,
 											'infos' => $sInfos,
-											'attcode' => $sAttCode,
 										);
 									}
 								}
@@ -853,29 +921,14 @@ EOF
 										'value' => "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode)."</span>",
 										'comments' => $sComments,
 										'infos' => $sInfos,
-										'attcode' => $sAttCode,
 									);
 									$aFieldsMap[$sAttCode] = $sInputId;
 								}
-
-								// Checking how the field should be rendered
-								// Note: For view mode, this is done in cmdbAbstractObject::GetFieldAsHtml()
-								// Note 2: Shouldn't this be a property of the AttDef instead an array that we have to maintain?
-								if (in_array($oAttDef->GetEditClass(),
-									array('Text', 'HTML', 'CaseLog', 'CustomFields', 'OQLExpression')))
-								{
-									$val['layout'] = 'large';
-								}
-								else
-								{
-									$val['layout'] = 'small';
-								}
 							}
 							else
 							{
 								$val = null; // Skip this field
 							}
-
 						}
 						else
 						{
@@ -885,6 +938,27 @@ EOF
 
 						if ($val != null)
 						{
+							// Add extra data for markup generation
+							// - Attribute code and AttributeDef. class
+							$val['attcode'] = $sAttCode;
+							$val['atttype'] = $sAttDefClass;
+							$val['attlabel'] = $sAttLabel;
+
+							// - How the field should be rendered
+							$val['layout'] = (in_array($oAttDef->GetEditClass(), static::GetAttEditClassesToRenderAsLargeField())) ? 'large' : 'small';
+
+							// - For simple fields, we get the raw (stored) value as well
+							$bExcludeRawValue = false;
+							foreach (static::GetAttDefClassesToExcludeFromMarkupMetadataRawValue() as $sAttDefClassToExclude)
+							{
+								if (is_a($sAttDefClass, $sAttDefClassToExclude, true))
+								{
+									$bExcludeRawValue = true;
+									break;
+								}
+							}
+							$val['value_raw'] = ($bExcludeRawValue === false) ? $this->Get($sAttCode) : '';
+
 							// The field is visible, add it to the current column
 							$aDetails[$sTab][$sColIndex][] = $val;
 							$iInputId++;
@@ -925,17 +999,21 @@ EOF
 	 */
 	public function DisplayDetails(WebPage $oPage, $bEditMode = false)
 	{
-		$sTemplate = Utils::ReadFromFile(MetaModel::GetDisplayTemplate(get_class($this)));
+		$sClass = get_class($this);
+		$iKey = $this->GetKey();
+		$sMode = static::ENUM_OBJECT_MODE_VIEW;
+
+		$sTemplate = Utils::ReadFromFile(MetaModel::GetDisplayTemplate($sClass));
 		if (!empty($sTemplate))
 		{
 			$oTemplate = new DisplayTemplate($sTemplate);
 			// Note: to preserve backward compatibility with home-made templates, the placeholder '$pkey$' has been preserved
 			//       but the preferred method is to use '$id$'
 			$oTemplate->Render($oPage, array(
-				'class_name' => MetaModel::GetName(get_class($this)),
-				'class' => get_class($this),
-				'pkey' => $this->GetKey(),
-				'id' => $this->GetKey(),
+				'class_name' => MetaModel::GetName($sClass),
+				'class' => $sClass,
+				'pkey' => $iKey,
+				'id' => $iKey,
 				'name' => $this->GetName(),
 			));
 		}
@@ -943,22 +1021,37 @@ EOF
 		{
 			// Object's details
 			// template not found display the object using the *old style*
-			$oPage->add('<div id="search-widget-results-outer">');
+			$oPage->add(<<<HTML
+<!-- Beginning of object-details -->
+<div id="search-widget-results-outer" class="object-details" data-object-class="$sClass" data-object-id="$iKey" data-object-mode="$sMode">
+HTML
+			);
 			$this->DisplayBareHeader($oPage, $bEditMode);
 			/** @var \iTopWebPage $oPage */
 			$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
 			$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-			$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+			$oPage->SetCurrentTab('UI:PropertiesTab');
 			$this->DisplayBareProperties($oPage, $bEditMode);
 			$this->DisplayBareRelations($oPage, $bEditMode);
-			//$oPage->SetCurrentTab(Dict::S('UI:HistoryTab'));
+			//$oPage->SetCurrentTab('UI:HistoryTab');
 			//$this->DisplayBareHistory($oPage, $bEditMode);
-			$oPage->AddAjaxTab(Dict::S('UI:HistoryTab'),
-				utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=history&class='.get_class($this).'&id='.$this->GetKey());
-			$oPage->add('</div>');
+			$oPage->AddAjaxTab('UI:HistoryTab',
+				utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=history&class='.$sClass.'&id='.$iKey);
+			$oPage->add(<<<HTML
+</div><!-- End of object-details -->
+HTML
+			);
 		}
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
 	public function DisplayPreview(WebPage $oPage)
 	{
 		$aDetails = array();
@@ -974,6 +1067,14 @@ EOF
 		$oPage->details($aDetails);
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams
+	 *
+	 * @throws \ApplicationException
+	 * @throws \CoreException
+	 */
 	public static function DisplaySet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 		$oPage->add(self::GetDisplaySet($oPage, $oSet, $aExtraParams));
@@ -1016,16 +1117,18 @@ EOF
 	/**
 	 * Get the HTML fragment corresponding to the display of a table representing a set of objects
 	 *
-	 * @param WebPage $oPage The page object is used for out-of-band information (mostly scripts) output
+	 * @see DisplayBlock to get a similar table but with the JS for pagination & sorting
+	 *
 	 * @param CMDBObjectSet The set of objects to display
 	 * @param array $aExtraParams Some extra configuration parameters to tweak the behavior of the display
 	 *
+	 * @param WebPage $oPage The page object is used for out-of-band information (mostly scripts) output
+	 *
 	 * @return String The HTML fragment representing the table of objects. <b>Warning</b> : no JS added to handled
 	 *     pagination or table sorting !
 	 *
+	 * @throws \CoreException*@throws \Exception
 	 * @throws \ApplicationException
-	 * @throws \CoreException
-	 * @see DisplayBlock to get a similar table but with the JS for pagination & sorting
 	 */
 	public static function GetDisplaySet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
@@ -1173,6 +1276,18 @@ EOF
 		return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 		if (empty($aExtraParams['currentId']))
@@ -1273,11 +1388,36 @@ EOF
 		return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 * @param string $sCharset
+	 *
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function DisplaySetAsCSV(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array(), $sCharset = 'UTF-8')
 	{
 		$oPage->add(self::GetSetAsCSV($oSet, $aParams, $sCharset));
 	}
 
+	/**
+	 * @param \DBObjectSet $oSet
+	 * @param array $aParams
+	 * @param string $sCharset
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
 	public static function GetSetAsCSV(DBObjectSet $oSet, $aParams = array(), $sCharset = 'UTF-8')
 	{
 		$sSeparator = isset($aParams['separator']) ? $aParams['separator'] : ','; // default separator is comma
@@ -1407,6 +1547,13 @@ EOF
 		return $sHtml;
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @throws \Exception
+	 */
 	public static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
 	{
 		$oPage->add(self::GetSetAsHTMLSpreadsheet($oSet, $aParams));
@@ -1415,6 +1562,17 @@ EOF
 	/**
 	 * Spreadsheet output: designed for end users doing some reporting
 	 * Then the ids are excluded and replaced by the corresponding friendlyname
+	 *
+	 * @param \DBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
 	 */
 	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = array())
 	{
@@ -1600,6 +1758,17 @@ EOF
 		return $sHtml;
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function DisplaySetAsXML(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
 	{
 		$bLocalize = true;
@@ -1667,6 +1836,14 @@ EOF
 		$oPage->add("</Set>\n");
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
 	public static function DisplaySearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 
@@ -1690,7 +1867,7 @@ EOF
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param \AttributeDefinition $oAttDef
@@ -1808,12 +1985,12 @@ EOF
 
 					$aStyles = array();
 					$sStyle = '';
-					$sWidth = $oAttDef->GetWidth('width', '');
+					$sWidth = $oAttDef->GetWidth();
 					if (!empty($sWidth))
 					{
 						$aStyles[] = 'width:'.$sWidth;
 					}
-					$sHeight = $oAttDef->GetHeight('height', '');
+					$sHeight = $oAttDef->GetHeight();
 					if (!empty($sHeight))
 					{
 						$aStyles[] = 'height:'.$sHeight;
@@ -1860,12 +2037,12 @@ EOF
 				case 'CaseLog':
 					$aStyles = array();
 					$sStyle = '';
-					$sWidth = $oAttDef->GetWidth('width', '');
+					$sWidth = $oAttDef->GetWidth();
 					if (!empty($sWidth))
 					{
 						$aStyles[] = 'width:'.$sWidth;
 					}
-					$sHeight = $oAttDef->GetHeight('height', '');
+					$sHeight = $oAttDef->GetHeight();
 					if (!empty($sHeight))
 					{
 						$aStyles[] = 'height:'.$sHeight;
@@ -2259,15 +2436,32 @@ EOF
 		$oPage->add_dict_entry('UI:ValueMustBeChanged');
 		$oPage->add_dict_entry('UI:ValueInvalidFormat');
 
+		// Note: In 2.8, remove the data-attcode attribute (either because it's has been moved to .field_container in 2.7 or even better because the admin. console has been reworked)
 		return "<div id=\"field_{$iId}\" class=\"field_value_container\"><div class=\"attribute-edit\" data-attcode=\"$sAttCode\">{$sHTMLValue}</div></div>";
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 */
 	public function DisplayModifyForm(WebPage $oPage, $aExtraParams = array())
 	{
 		$sOwnershipToken = null;
 		$iKey = $this->GetKey();
 		$sClass = get_class($this);
-		if ($iKey > 0)
+		$sMode = ($iKey > 0) ? static::ENUM_OBJECT_MODE_EDIT : static::ENUM_OBJECT_MODE_CREATE;
+
+		if ($sMode === static::ENUM_OBJECT_MODE_EDIT)
 		{
 			// The concurrent access lock makes sense only for already existing objects
 			$LockEnabled = MetaModel::GetConfig()->Get('concurrent_lock_enabled');
@@ -2302,13 +2496,22 @@ EOF
 		if (isset($aExtraParams['wizard_container']) && $aExtraParams['wizard_container'])
 		{
 			$sClassLabel = MetaModel::GetName($sClass);
+			$sHeaderTitle = Dict::Format('UI:ModificationTitle_Class_Object', $sClassLabel,
+				$this->GetName());
+
 			$oPage->set_title(Dict::Format('UI:ModificationPageTitle_Object_Class', $this->GetRawName(),
 				$sClassLabel)); // Set title will take care of the encoding
-			$oPage->add("<div class=\"page_header\">\n");
-			$oPage->add("<h1>".$this->GetIcon()."&nbsp;".Dict::Format('UI:ModificationTitle_Class_Object', $sClassLabel,
-					$this->GetName())."</h1>\n");
-			$oPage->add("</div>\n");
-			$oPage->add("<div class=\"wizContainer\">\n");
+
+			$oPage->add(<<<HTML
+<!-- Beginning of object-details -->
+<div class="object-details" data-object-class="$sClass" data-object-id="$iKey" data-object-mode="$sMode">
+	<div class="page_header">
+		<h1>{$this->GetIcon()} $sHeaderTitle</h1>
+	</div>
+	<!-- Beginning of wizContainer -->
+	<div class="wizContainer">
+HTML
+			);
 		}
 		self::$iGlobalFormId++;
 		$this->aFieldsMap = array();
@@ -2335,7 +2538,7 @@ EOF
 		}
 		else
 		{
-			if ($iKey > 0)
+			if ($sMode === static::ENUM_OBJECT_MODE_EDIT)
 			{
 				$sApplyButton = Dict::S('UI:Button:Apply');
 			}
@@ -2351,7 +2554,7 @@ EOF
 		}
 		else
 		{
-			if ($iKey > 0)
+			if ($sMode === static::ENUM_OBJECT_MODE_EDIT)
 			{
 				$sOperation = 'apply_modify';
 			}
@@ -2360,7 +2563,7 @@ EOF
 				$sOperation = 'apply_new';
 			}
 		}
-		if ($iKey > 0)
+		if ($sMode === static::ENUM_OBJECT_MODE_EDIT)
 		{
 			// The object already exists in the database, it's a modification
 			$sButtons = "<input id=\"{$sPrefix}_id\" type=\"hidden\" name=\"id\" value=\"$iKey\">\n";
@@ -2422,7 +2625,17 @@ EOF
 							$sStateCode).'</option>';
 				}
 				$sStatesSelection .= '</select>';
-				$oPage->add_ready_script("$('.state_select_{$this->m_iFormId}').change( function() { oWizardHelper$sPrefix.ReloadObjectCreationForm('form_{$this->m_iFormId}', $(this).val()); } );");
+				$sStatesSelection .= '<input type="hidden" id="obj_state_orig" name="obj_state_orig" value="'.$this->GetState().'"/>';
+				$oPage->add_ready_script(<<<JAVASCRIPT
+$('.state_select_{$this->m_iFormId}').change( function() {
+	if ($('#obj_state_orig').val() != $(this).val()) {
+		$('.state_select_{$this->m_iFormId}').val($(this).val());
+		$('#form_{$this->m_iFormId}').data('force_submit', true);
+		$('#form_{$this->m_iFormId}').submit();
+	}
+});
+JAVASCRIPT
+			);
 			}
 		}
 
@@ -2450,14 +2663,14 @@ EOF
 
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, $sPrefix);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$oPage->SetCurrentTab('UI:PropertiesTab');
 
 		$aFieldsMap = $this->DisplayBareProperties($oPage, true, $sPrefix, $aExtraParams);
 		if (!is_array($aFieldsMap))
 		{
 			$aFieldsMap = array();
 		}
-		if ($iKey > 0)
+		if ($sMode === static::ENUM_OBJECT_MODE_EDIT)
 		{
 			$aFieldsMap['id'] = $sPrefix.'_id';
 		}
@@ -2498,7 +2711,12 @@ EOF
 
 		if (isset($aExtraParams['wizard_container']) && $aExtraParams['wizard_container'])
 		{
-			$oPage->add("</div>\n");
+			// Close wizContainer and object-details
+			$oPage->add(<<<HTML
+	</div><!-- End of wizContainer -->
+</div><!-- End of object-details -->
+HTML
+			);
 		}
 
 		$iFieldsCount = count($aFieldsMap);
@@ -2549,6 +2767,20 @@ EOF
 		}
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 * @param string $sClass
+	 * @param null $oObjectToClone
+	 * @param array $aArgs
+	 * @param array $aExtraParams
+	 *
+	 * @return mixed
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function DisplayCreationForm(WebPage $oPage, $sClass, $oObjectToClone = null, $aArgs = array(), $aExtraParams = array())
 	{
 		$sClass = ($oObjectToClone == null) ? $sClass : get_class($oObjectToClone);
@@ -2615,10 +2847,26 @@ EOF
 		return $oObj->DisplayModifyForm($oPage, $aExtraParams);
 	}
 
-	public function DisplayStimulusForm(WebPage $oPage, $sStimulus, $aPrefillFormParam = null)
+	/**
+	 * @param \WebPage $oPage
+	 * @param string $sStimulus
+	 * @param null $aPrefillFormParam
+	 *
+	 * @throws \ApplicationException
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function DisplayStimulusForm(WebPage $oPage, $sStimulus, $aPrefillFormParam = null, $bDisplayBareProperties = true)
 	{
 		$sClass = get_class($this);
 		$iKey = $this->GetKey();
+		$sMode = static::ENUM_OBJECT_MODE_STIMULUS;
+
 		$aTransitions = $this->EnumTransitions();
 		$aStimuli = MetaModel::EnumStimuli($sClass);
 		if (!isset($aTransitions[$sStimulus]))
@@ -2627,6 +2875,7 @@ EOF
 			throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus,
 				$this->GetName(), $this->GetStateLabel()));
 		}
+
 		// Check for concurrent access lock
 		$LockEnabled = MetaModel::GetConfig()->Get('concurrent_lock_enabled');
 		$sOwnershipToken = null;
@@ -2649,12 +2898,22 @@ EOF
 		}
 		$sActionLabel = $aStimuli[$sStimulus]->GetLabel();
 		$sActionDetails = $aStimuli[$sStimulus]->GetDescription();
-		$oPage->add("<div class=\"page_header\">\n");
-		$oPage->add("<h1>$sActionLabel - <span class=\"hilite\">{$this->GetName()}</span></h1>\n");
-		$oPage->set_title($sActionLabel);
-		$oPage->add("</div>\n");
-		$oPage->add("<h1>$sActionDetails</h1>\n");
+
+		// Get info on current state
+		$sCurrentState = $this->GetState();
 		$sTargetState = $aTransitions[$sStimulus]['target_state'];
+
+		$oPage->set_title($sActionLabel);
+		$oPage->add(<<<HTML
+<!-- Beginning of object-details -->
+<div class="object-details" data-object-class="$sClass" data-object-id="$iKey" data-object-mode="$sMode" data-object-current-state="$sCurrentState" data-object-target-state="$sTargetState">
+	<div class="page_header">
+		<h1>$sActionLabel - <span class="hilite">{$this->GetName()}</span></h1>
+	</div>
+	<h1>$sActionDetails</h1>
+HTML
+		);
+
 		$aExpectedAttributes = $this->GetTransitionAttributes($sStimulus /*, current state*/);
 		if ($aPrefillFormParam != null)
 		{
@@ -2663,7 +2922,7 @@ EOF
 			$aExpectedAttributes = $aPrefillFormParam['expected_attributes'];
 		}
 		$sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
-		if ($sButtonsPosition == 'bottom')
+		if ($sButtonsPosition == 'bottom' && $bDisplayBareProperties)
 		{
 			// bottom: Displays the ticket details BEFORE the actions
 			$oPage->add('<div class="ui-widget-content">');
@@ -2769,8 +3028,12 @@ EOF
 		$oPage->add("<button type=\"button\" class=\"action cancel\" onClick=\"BackToDetails('$sClass', ".$this->GetKey().", '', '$sOwnershipToken')\"><span>".Dict::S('UI:Button:Cancel')."</span></button>&nbsp;&nbsp;&nbsp;&nbsp;\n");
 		$oPage->add("<button type=\"submit\" class=\"action\"><span>$sActionLabel</span></button>\n");
 		$oPage->add("</form>\n");
-		$oPage->add("</div>\n");
-		if ($sButtonsPosition != 'top')
+		$oPage->add(<<<HTML
+	</div>
+</div><!-- End of object-details -->
+HTML
+		);
+		if ($sButtonsPosition != 'top' && $bDisplayBareProperties)
 		{
 			// bottom or both: Displays the ticket details AFTER the actions
 			$oPage->add('<div class="ui-widget-content">');
@@ -2927,20 +3190,7 @@ EOF
 				'label' => '<span title="'.MetaModel::GetDescription($sClass,
 						$sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>',
 				'value' => $sDisplayValue,
-				'attcode' => $sAttCode,
 			);
-
-			// Checking how the field should be rendered
-			// Note: For edit mode, this is done in self::GetBareProperties()
-			// Note 2: Shouldn't this be a AttDef property instead of an array to maintain?
-			if (in_array($oAttDef->GetEditClass(), array('Text', 'HTML', 'CaseLog', 'CustomFields', 'OQLExpression')))
-			{
-				$retVal['layout'] = 'large';
-			}
-			else
-			{
-				$retVal['layout'] = 'small';
-			}
 		}
 
 		return $retVal;
@@ -3837,6 +4087,16 @@ EOF
 		$this->bAllowWrite = $bAllow;
 	}
 
+	/**
+	 * Bypass the check of the user rights when deleting this object
+	 *
+	 * @param bool $bAllow True to bypass the checks, false to restore the default behavior
+	 */
+	public function AllowDelete($bAllow = true)
+	{
+		$this->bAllowDelete = $bAllow;
+	}
+
 	/**
 	 * @inheritdoc
 	 * @throws \ArchivedObjectException
@@ -3909,22 +4169,39 @@ EOF
 
 		// User rights
 		//
-		$bDeleteAllowed = UserRights::IsActionAllowed(get_class($this), UR_ACTION_DELETE,
-			DBObjectSet::FromObject($this));
-		if (!$bDeleteAllowed)
+		if (! $this->bAllowDelete)
 		{
-			// Security issue
-			$this->m_bSecurityIssue = true;
-			$this->m_aDeleteIssues[] = Dict::S('UI:Delete:NotAllowedToDelete');
+			$bDeleteAllowed = UserRights::IsActionAllowed(get_class($this), UR_ACTION_DELETE, DBObjectSet::FromObject($this));
+
+			if (!$bDeleteAllowed)
+			{
+				// Security issue
+				$this->m_bSecurityIssue = true;
+				$this->m_aDeleteIssues[] = Dict::S('UI:Delete:NotAllowedToDelete');
+			}
 		}
 	}
 
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
+	 *
+	 * @param \WebPage $oPage
+	 * @param string $sAttCode
+	 * @param string $sComment
+	 * @param string $sPrefix
+	 * @param bool $bEditMode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
 	 */
 	public function DisplayCaseLog(WebPage $oPage, $sAttCode, $sComment = '', $sPrefix = '', $bEditMode = false)
 	{
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$oPage->SetCurrentTab('UI:PropertiesTab');
 		$sClass = get_class($this);
 		if ($this->IsNew())
 		{
@@ -3957,10 +4234,11 @@ EOF
 					{
 						$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
 						$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
-						$sTip .= "<div class='synchro-source'>";
-						$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
-						$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
+						$sTip .= "<div class=\"synchro-source\">";
+						$sTip .= "<div class=\"synchro-source-title\">Synchronized with {$aRow['name']}</div>";
+						$sTip .= "<div class=\"synchro-source-description\">$sDescription</div>";
 					}
+					$sTip = addslashes($sTip);
 					$oPage->add_ready_script("$('#synchro_$sInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
 				}
 
@@ -4309,6 +4587,20 @@ EOF
 
 	/**
 	 * Process the reply made from a form built with DisplayBulkModifyForm
+	 *
+	 * @param \WebPage $oP
+	 * @param string $sClass
+	 * @param array $aSelectedObj
+	 * @param string $sCustomOperation
+	 * @param bool $bPreview
+	 * @param string $sCancelUrl
+	 * @param array $aContextData
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \OQLException
 	 */
 	public static function DoBulkModify($oP, $sClass, $aSelectedObj, $sCustomOperation, $bPreview, $sCancelUrl, $aContextData = array())
 	{
@@ -4433,13 +4725,14 @@ EOF
 	 *
 	 * @param \WebPage $oP
 	 * @param $sClass
-	 * @param $aObjects
+	 * @param \DBObject[] $aObjects
 	 * @param $bPreview
 	 * @param $sCustomOperation
 	 * @param array $aContextData
 	 *
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
 	 */
 	public static function DeleteObjects(WebPage $oP, $sClass, $aObjects, $bPreview, $sCustomOperation, $aContextData = array())
 	{
@@ -4453,7 +4746,7 @@ EOF
 			}
 			else
 			{
-				$oObj->DBDeleteTracked(CMDBObject::GetCurrentChange(), null, $oDeletionPlan);
+				$oObj->DBDelete($oDeletionPlan);
 			}
 		}
 
@@ -4735,6 +5028,8 @@ EOF
 	/**
 	 * Find redundancy settings that can be viewed and modified in a tab
 	 * Settings are distributed to the corresponding link set attribute so as to be shown in the relevant tab
+	 *
+	 * @throws \Exception
 	 */
 	protected function FindVisibleRedundancySettings()
 	{
@@ -4808,4 +5103,44 @@ EOF
 EOF
 		);
 	}
+
+	/**
+	 * Return an array of AttributeDefinition EditClass that should be rendered as large field in the UI
+	 *
+	 * @return array
+	 * @since 2.7.0
+	 */
+	protected static function GetAttEditClassesToRenderAsLargeField(){
+		return array(
+			'CaseLog',
+			'CustomFields',
+			'HTML',
+			'OQLExpression',
+			'Text',
+		);
+	}
+
+	/**
+	 * Return an array of AttributeDefinition classes that should be excluded from the markup metadata when priting raw value (typically large values)
+	 * This markup is mostly aimed at CSS/JS hooks for extensions and Behat tests
+	 *
+	 * @return array
+	 * @since 2.7.0
+	 *
+	 * @internal Do NOT use, this is experimental and most likely to be moved elsewhere when we find its rightful place.
+	 */
+	public static function GetAttDefClassesToExcludeFromMarkupMetadataRawValue(){
+		return array(
+			'AttributeBlob',
+			'AttributeCustomFields',
+			'AttributeDashboard',
+			'AttributeLinkedSet',
+			'AttributeStopWatch',
+			'AttributeSubItem',
+			'AttributeTable',
+			'AttributeText',
+			'AttributePassword',
+			'AttributeOneWayPassword',
+		);
+	}
 }

application/dashboard.class.inc.php

@@ -1,20 +1,21 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-2019 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
 
 require_once(APPROOT.'application/dashboardlayout.class.inc.php');
 require_once(APPROOT.'application/dashlet.class.inc.php');
@@ -24,21 +25,33 @@ require_once(APPROOT.'core/modelreflection.class.inc.php');
  *
  * A user editable dashboard page
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
  */
 abstract class Dashboard
 {
+	/** @var string $sTitle*/
 	protected $sTitle;
+	/** @var bool $bAutoReload */
 	protected $bAutoReload;
+	/** @var float|int $iAutoReloadSec */
 	protected $iAutoReloadSec;
+	/** @var string $sLayoutClass */
 	protected $sLayoutClass;
+	/** @var array $aWidgetsData */
 	protected $aWidgetsData;
+	/** @var \DOMNode|null $oDOMNode */
 	protected $oDOMNode;
+	/** @var string $sId */
 	protected $sId;
+	/** @var array $aCells */
 	protected $aCells;
+	/** @var \ModelReflection $oMetaModel */
 	protected $oMetaModel;
-	
+
+	/**
+	 * Dashboard constructor.
+	 *
+	 * @param string $sId
+	 */
 	public function __construct($sId)
 	{
 		$this->sTitle = '';
@@ -51,7 +64,7 @@ abstract class Dashboard
 	}
 
 	/**
-	 * @param $sXml
+	 * @param string $sXml
 	 *
 	 * @throws \Exception
 	 */
@@ -64,7 +77,10 @@ abstract class Dashboard
 		restore_error_handler();
 		$this->FromDOMDocument($oDoc);
 	}
-	
+
+	/**
+	 * @param \DOMDocument $oDoc
+	 */
 	public function FromDOMDocument(DOMDocument $oDoc)
 	{
 		$this->oDOMNode = $oDoc->getElementsByTagName('dashboard')->item(0);
@@ -160,9 +176,16 @@ abstract class Dashboard
 	protected function InitDashletFromDOMNode($oDomNode)
     {
         $sId = $oDomNode->getAttribute('id');
+        // To avoid collision with other dashlets with the same ID we suffix it. Collisions typically happen with extensions.
+	    // Note: The check is done so we don't append it at each save of the dashboard.
+        if(strpos($sId, 'uniqid_') === false)
+        {
+        	$sId .= '_uniqid_' . uniqid();
+        }
+
 	    $sDashletType = $oDomNode->getAttribute('xsi:type');
 
-        // Test if dashlet can be instanciated, otherwise (uninstalled, broken, ...) we display a placeholder
+        // Test if dashlet can be instantiated, otherwise (uninstalled, broken, ...) we display a placeholder
 	    $sClass = static::GetDashletClassFromType($sDashletType);
 	    /** @var \Dashlet $oNewDashlet */
 	    $oNewDashlet = new $sClass($this->oMetaModel, $sId);
@@ -172,7 +195,13 @@ abstract class Dashboard
         return $oNewDashlet;
     }
 
-	static function SortOnRank($aItem1, $aItem2)
+	/**
+	 * @param array $aItem1
+	 * @param array $aItem2
+	 *
+	 * @return int
+	 */
+	public static function SortOnRank($aItem1, $aItem2)
 	{
 		return ($aItem1['rank'] > $aItem2['rank']) ? +1 : -1;
 	}
@@ -200,6 +229,10 @@ abstract class Dashboard
 		}
 	}
 
+	/**
+	 * @return string
+	 * @throws \Exception
+	 */
 	public function ToXml()
 	{
 		$oDoc = new DOMDocument();
@@ -268,7 +301,9 @@ abstract class Dashboard
 		}
 	}
 
-
+	/**
+	 * @param array $aParams
+	 */
 	public function FromParams($aParams)
 	{
 		$this->sLayoutClass = $aParams['layout_class'];
@@ -305,42 +340,66 @@ abstract class Dashboard
 	{
 		
 	}
-	
+
+	/**
+	 * @return string
+	 */
 	public function GetLayout()
 	{
 		return $this->sLayoutClass;
 	}
-	
+
+	/**
+	 * @param string $sLayoutClass
+	 */
 	public function SetLayout($sLayoutClass)
 	{
 		$this->sLayoutClass = $sLayoutClass;
 	}
-	
+
+	/**
+	 * @return string
+	 */
 	public function GetTitle()
 	{
 		return $this->sTitle;
 	}
 
+	/**
+	 * @param string $sTitle
+	 */
 	public function SetTitle($sTitle)
 	{
 		$this->sTitle = $sTitle;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function GetAutoReload()
 	{
 		return $this->bAutoReload;
 	}
 
+	/**
+	 * @param bool $bAutoReload
+	 */
 	public function SetAutoReload($bAutoReload)
 	{
 		$this->bAutoReload = $bAutoReload;
 	}
 
+	/**
+	 * @return float|int
+	 */
 	public function GetAutoReloadInterval()
 	{
 		return $this->iAutoReloadSec;
 	}
 
+	/**
+	 * @param bool $iAutoReloadSec
+	 */
 	public function SetAutoReloadInterval($iAutoReloadSec)
 	{
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int)$iAutoReloadSec);
@@ -356,12 +415,13 @@ abstract class Dashboard
 		$this->aCells[] = array($oDashlet);
 	}
 
-    /**
-     * @param \WebPage $oPage     *
-     * @param array $aExtraParams
-     *
-     * @throws \ReflectionException
-     */
+	/**
+	 * @param \WebPage $oPage *
+	 * @param array $aExtraParams
+	 *
+	 * @throws \ReflectionException
+	 * @throws \Exception
+	 */
 	public function RenderProperties($oPage, $aExtraParams = array())
 	{
 		// menu to pick a layout and edit other properties of the dashboard
@@ -449,7 +509,7 @@ EOF
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
@@ -468,6 +528,12 @@ EOF
 		}
 	}
 
+	/**
+	 * @param \WebPage $oPage
+	 *
+	 * @throws \ReflectionException
+	 * @throws \Exception
+	 */
 	public function RenderDashletsSelection(WebPage $oPage)
 	{
 		// Toolbox/palette to drag and drop dashlets
@@ -485,7 +551,11 @@ EOF
 		$oPage->add('</div>');
 		$oPage->add_ready_script("$('.dashlet_icon').draggable({helper: 'clone', appendTo: 'body', zIndex: 10000, revert:'invalid'});");
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 */
 	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
 	{
 		// Toolbox/palette to edit the properties of each dashlet
@@ -545,7 +615,10 @@ EOF
 
 		return $aDashlets;
 	}
-	
+
+	/**
+	 * @return int|mixed
+	 */
 	protected function GetNewDashletId()
 	{
 		$iNewId = 0;
@@ -561,13 +634,19 @@ EOF
 	}
 
     /**
-     * @param $oForm
+     * @param \DesignerForm $oForm
      * @param array $aExtraParams
      *
      * @return mixed
      */
 	abstract protected function SetFormParams($oForm, $aExtraParams = array());
 
+	/**
+	 * @param string $sType
+	 * @param \ModelFactory|null $oFactory
+	 *
+	 * @return string
+	 */
 	public static function GetDashletClassFromType($sType, $oFactory = null)
 	{
 		if (is_subclass_of($sType, 'Dashlet'))
@@ -586,37 +665,49 @@ EOF
 	}
 }
 
+/**
+ * Class RuntimeDashboard
+ */
 class RuntimeDashboard extends Dashboard
 {
+	/** @var bool $bCustomized */
 	protected $bCustomized;
+	/** @var string $sDefinitionFile */
 	private $sDefinitionFile = '';
+	/** @var null $sReloadURL */
 	private $sReloadURL = null;
 
-
+	/**
+	 * @inheritDoc
+	 */
 	public function __construct($sId)
 	{
 		parent::__construct($sId);
 		$this->bCustomized = false;
 		$this->oMetaModel = new ModelReflectionRuntime();
 	}
-		
+
+	/**
+	 * @param bool $bCustomized
+	 */
 	public function SetCustomFlag($bCustomized)
 	{
 		$this->bCustomized = $bCustomized;
 	}
 
 	/**
-	 * @param \DesignerForm $oForm
-	 *
-	 * @param array $aExtraParams
-	 *
+	 * @inheritDoc
 	 * @throws \Exception
 	 */
 	protected function SetFormParams($oForm, $aExtraParams = array())
 	{
 		$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
 	}
-	
+
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
 	public function Save()
 	{
 		$sXml = $this->ToXml();
@@ -632,7 +723,7 @@ class RuntimeDashboard extends Dashboard
 		}
 		else
 		{
-			// No such customized dasboard for the current user, let's create a new record
+			// No such customized dashboard for the current user, let's create a new record
 			$oUserDashboard = new UserDashboard();
 			$oUserDashboard->Set('user_id', UserRights::GetUserId());
 			$oUserDashboard->Set('menu_code', $this->sId);
@@ -642,7 +733,18 @@ class RuntimeDashboard extends Dashboard
 		$oUserDashboard->DBWrite();
 		utils::PopArchiveMode();
 	}
-	
+
+	/**
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DeleteException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 */
 	public function Revert()
 	{
 		$oUDSearch = new DBObjectSearch('UserDashboard');
@@ -669,6 +771,7 @@ class RuntimeDashboard extends Dashboard
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
 	 */
 	public static function GetDashboard($sDashboardFile, $sDashBoardId)
 	{
@@ -713,10 +816,7 @@ class RuntimeDashboard extends Dashboard
 	}
 
 	/**
-	 * @param \iTopWebPage $oPage
-	 * @param bool $bEditMode
-	 * @param array $aExtraParams (class and id of the current object
-	 *
+	 * @inheritDoc
 	 * @throws \Exception
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
@@ -851,6 +951,9 @@ EOF
 		);
 	}
 
+	/**
+	 * @return bool
+	 */
 	protected function HasCustomDashboard()
 	{
 		try
@@ -879,7 +982,7 @@ EOF
 	{
 		$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><img src=\"../images/pencil-menu.png\"><ul>";
+		$sEditMenu = "<div id=\"DashboardMenu\"><ul><li><i class=\"top-right-icon icon-additional-arrow fas fa-pencil-alt\"></i><ul>";
 	
 		$aActions = array();
 		$sFile = addslashes($this->sDefinitionFile);
@@ -939,9 +1042,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
-	 *
-	 * @throws \ReflectionException
+	 * @inheritDoc
 	 */
 	public function RenderProperties($oPage, $aExtraParams = array())
 	{
@@ -977,7 +1078,7 @@ EOF
 
 
 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 *
 	 * @param array $aExtraParams
 	 *
@@ -1117,7 +1218,14 @@ EOF
 		);
 		$oPage->add_ready_script("");
 	}
-	
+
+	/**
+	 * @param string|null $sOQL
+	 *
+	 * @return \DesignerForm
+	 * @throws \DictExceptionMissingString
+	 * @throws \ReflectionException
+	 */
 	public static function GetDashletCreationForm($sOQL = null)
 	{
 		$oAppContext = new ApplicationContext();
@@ -1228,6 +1336,9 @@ EOF
 	/**
 	 * @param \WebPage $oPage
 	 * @param $sOQL
+	 *
+	 * @throws \DictExceptionMissingString
+	 * @throws \ReflectionException
 	 */
 	public static function GetDashletCreationDlgFromOQL($oPage, $sOQL)
 	{
@@ -1292,13 +1403,19 @@ EOF
 		$this->sDefinitionFile = $sDefinitionFile;
 	}
 
+	/**
+	 * @return string|null
+	 */
 	public function GetReloadURL()
 	{
 		return $this->sReloadURL;
 	}
 
+	/**
+	 * @param string $sReloadURL
+	 */
 	public function SetReloadURL($sReloadURL)
 	{
 		$this->sReloadURL = $sReloadURL;
 	}
-}
+}

application/datamodel.application.xml

@@ -15,5 +15,10 @@
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
     </menu>
+    <menu id="System" xsi:type="MenuGroup" _delta="define">
+      <rank>100</rank>
+      <enable_class>ResourceSystemMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
   </menus>
 </itop_design>

application/datatable.class.inc.php

@@ -1,25 +1,20 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * Data Table to display a set of objects in a tabular manner in HTML
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * 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
  */
 
 class DataTable
@@ -36,8 +31,13 @@ class DataTable
 	/**
 	 * @param $iListId mixed Unique ID for this div/table in the page
 	 * @param $oSet DBObjectSet The set of data to display
-	 * @param $aClassAliases Hash The list of classes/aliases to be displayed in this set $sAlias => $sClassName
+	 * @param $aClassAliases array The list of classes/aliases to be displayed in this set $sAlias => $sClassName
 	 * @param $sTableId mixed A string (or null) identifying this table in order to persist its settings
+	 *
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
 	 */
 	public function __construct($iListId, $oSet, $aClassAliases, $sTableId = null)
 	{
@@ -50,7 +50,19 @@ class DataTable
 		$this->oDefaultSettings = null;
 		$this->bShowObsoleteData = $oSet->GetShowObsoleteData();
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param \DataTableSettings $oSettings
+	 * @param $bActionsMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 */
 	public function Display(WebPage $oPage, DataTableSettings $oSettings, $bActionsMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		$this->oDefaultSettings = $oSettings;
@@ -119,7 +131,23 @@ class DataTable
 		
 		return $this->GetAsHTML($oPage, $oCustomSettings->iDefaultPageSize, $oCustomSettings->iDefaultPageSize, 0, $oCustomSettings->aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams);
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		$sObjectsCount = $this->GetObjectCount($oPage, $sSelectMode);
@@ -198,7 +226,13 @@ class DataTable
 		}
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $sSelectMode
+	 *
+	 * @return string
+	 */
 	protected function GetObjectCount(WebPage $oPage, $sSelectMode)
 	{
 		if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
@@ -211,6 +245,15 @@ class DataTable
 		}
 		return $sHtml;		
 	}
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 *
+	 * @return string
+	 */
 	protected function GetPager(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex)
 	{
 		$sHtml = '';
@@ -295,7 +338,17 @@ class DataTable
 EOF;
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 */
 	protected function GetActionsMenu(WebPage $oPage, $aExtraParams)
 	{
 		$oMenuBlock = new MenuBlock($this->oSet->GetFilter(), 'list');
@@ -303,13 +356,20 @@ EOF;
 		$sHtml = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $this->iListId);
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
 	protected function GetToolkitMenu(WebPage $oPage, $aExtraParams)
 	{
 		if (!$oPage->IsPrintableVersion())
 		{
 			$sMenuTitle = Dict::S('UI:ConfigureThisList');
-			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?t='.utils::GetCacheBusterTimestamp().'"><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(
@@ -326,7 +386,15 @@ EOF;
 		}
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $aColumns
+	 * @param $bViewLink
+	 * @param $iDefaultPageSize
+	 *
+	 * @return string
+	 */
 	protected function GetTableConfigDlg(WebPage $oPage, $aColumns, $bViewLink, $iDefaultPageSize)
 	{
 		$sHtml = "<div id=\"datatable_dlg_{$this->iListId}\" style=\"display: none;\">";
@@ -362,23 +430,42 @@ EOF;
 
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param $oSetting
+	 *
+	 * @return array
+	 */
 	public function GetAsHash($oSetting)
 	{
 		$aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
 		return $aSettings;
 	}
-	
+
+	/**
+	 * @param array $aColumns
+	 * @param string $sSelectMode
+	 * @param bool $bViewLink
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
 	protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
 	{
 		$aAttribs = array();
 		if ($sSelectMode == 'multiple')
 		{
-			$aAttribs['form::select'] = array('label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->iListId}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>", 'description' => Dict::S('UI:SelectAllToggle+'));
+			$aAttribs['form::select'] = array(
+				'label' => "<input type=\"checkbox\" onClick=\"CheckAll('.selectList{$this->iListId}:not(:disabled)', this.checked);\" class=\"checkAll\"></input>",
+				'description' => Dict::S('UI:SelectAllToggle+'),
+				'metadata' => array(),
+			);
 		}
 		else if ($sSelectMode == 'single')
 		{
-			$aAttribs['form::select'] = array('label' => "", 'description' => '');
+			$aAttribs['form::select'] = array('label' => '', 'description' => '', 'metadata' => array());
 		}
 
 		foreach($this->aClassAliases as $sAlias => $sClassName)
@@ -389,19 +476,55 @@ EOF;
 				{
 					if ($sAttCode == '_key_')
 					{
-						$aAttribs['key_'.$sAlias] = array('label' => MetaModel::GetName($sClassName), 'description' => '');
+						$sAttLabel = MetaModel::GetName($sClassName);
+
+						$aAttribs['key_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => '',
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_label' => $sAttLabel,
+							),
+						);
 					}
 					else
 					{
 						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
-						$aAttribs[$sAttCode.'_'.$sAlias] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => $oAttDef->GetOrderByHint());
+						$sAttDefClass = get_class($oAttDef);
+						$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);
+
+						$aAttribs[$sAttCode.'_'.$sAlias] = array(
+							'label' => $sAttLabel,
+							'description' => $oAttDef->GetOrderByHint(),
+							'metadata' => array(
+								'object_class' => $sClassName,
+								'attribute_code' => $sAttCode,
+								'attribute_type' => $sAttDefClass,
+								'attribute_label' => $sAttLabel,
+							),
+						);
 					}
 				}
 			}
 		}
 		return $aAttribs;
 	}
-	
+
+	/**
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
 	protected function GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$bLocalize = true;
@@ -411,6 +534,7 @@ EOF;
 		}
 
 		$aValues = array();
+		$aAttDefsCache = array();
 		$this->oSet->Seek(0);
 		$iMaxObjects = $iPageSize;
 		while (($aObjects = $this->oSet->FetchAssoc()) && ($iMaxObjects != 0))
@@ -451,11 +575,41 @@ EOF;
 						{
 							if ($sAttCode == '_key_')
 							{
-								$aRow['key_'.$sAlias] = $aObjects[$sAlias]->GetHyperLink();
+								$aRow['key_'.$sAlias] = array(
+									'value_raw' => $aObjects[$sAlias]->GetKey(),
+									'value_html' => $aObjects[$sAlias]->GetHyperLink(),
+								);
 							}
 							else
 							{
-								$aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize);
+								// Prepare att. def. classes cache to avoid retrieving AttDef for each row
+								if(!isset($aAttDefsCache[$sClassName][$sAttCode]))
+								{
+									$aAttDefClassesCache[$sClassName][$sAttCode] = get_class(MetaModel::GetAttributeDef($sClassName, $sAttCode));
+								}
+
+								// Only retrieve raw (stored) value for simple fields
+								$bExcludeRawValue = false;
+								foreach (cmdbAbstractObject::GetAttDefClassesToExcludeFromMarkupMetadataRawValue() as $sAttDefClassToExclude)
+								{
+									if (is_a($aAttDefClassesCache[$sClassName][$sAttCode], $sAttDefClassToExclude, true))
+									{
+										$bExcludeRawValue = true;
+										break;
+									}
+								}
+
+								if($bExcludeRawValue)
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize);
+								}
+								else
+								{
+									$aRow[$sAttCode.'_'.$sAlias] = array(
+										'value_raw' => $aObjects[$sAlias]->Get($sAttCode),
+										'value_html' => $aObjects[$sAlias]->GetAsHTML($sAttCode, $bLocalize),
+									);
+								}
 							}
 						}
 					}
@@ -484,7 +638,25 @@ EOF;
 		}
 		return $aValues;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 */
 	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
@@ -496,7 +668,7 @@ EOF;
 
 		$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
 
-		$sHtml = '<table class="listContainer">';
+		$sHtml = '<table class="listContainer object-list">';
 
 		foreach($this->oSet->GetFilter()->GetInternalParams() as $sName => $sValue)
 		{
@@ -585,7 +757,12 @@ EOF
 		}
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $iDefaultPageSize
+	 * @param $iStart
+	 */
 	public function UpdatePager(WebPage $oPage, $iDefaultPageSize, $iStart)
 	{
 		$iPageSize = $iDefaultPageSize;
@@ -609,11 +786,48 @@ EOF
  */
 class PrintableDataTable extends DataTable
 {
+	/**
+	 * @param \WebPage $oPage
+	 * @param $iPageSize
+	 * @param $iDefaultPageSize
+	 * @param $iPageIndex
+	 * @param $aColumns
+	 * @param $bActionsMenu
+	 * @param $bToolkitMenu
+	 * @param $sSelectMode
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public function GetAsHTML(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex, $aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams)
 	{
 		return $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, -1, $bViewLink, $aExtraParams);
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param $aColumns
+	 * @param $sSelectMode
+	 * @param $iPageSize
+	 * @param $bViewLink
+	 * @param $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
 	{
 		$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
@@ -638,7 +852,13 @@ class DataTableSettings implements Serializable
 	public $iDefaultPageSize;
 	public $aColumns;
 
-	
+
+	/**
+	 * DataTableSettings constructor.
+	 *
+	 * @param $aClassAliases
+	 * @param null $sTableId
+	 */
 	public function __construct($aClassAliases, $sTableId = null)
 	{
 		$this->aClassAliases = $aClassAliases;
@@ -646,14 +866,22 @@ class DataTableSettings implements Serializable
 		$this->iDefaultPageSize = 10;
 		$this->aColumns = array();
 	}
-	
+
+	/**
+	 * @param $iDefaultPageSize
+	 * @param $aSortOrder
+	 * @param $aColumns
+	 */
 	protected function Init($iDefaultPageSize, $aSortOrder, $aColumns)
 	{
 		$this->iDefaultPageSize = $iDefaultPageSize;
 		$this->aColumns = $aColumns;
 		$this->FixVisibleColumns();
 	}
-	
+
+	/**
+	 * @return string
+	 */
 	public function serialize()
 	{
 		// Save only the 'visible' columns
@@ -679,7 +907,12 @@ class DataTableSettings implements Serializable
 			)
 		);
 	}
-	
+
+	/**
+	 * @param string $sData
+	 *
+	 * @throws \Exception
+	 */
 	public function unserialize($sData)
 	{
 		$aData = unserialize($sData);
@@ -712,7 +945,16 @@ class DataTableSettings implements Serializable
 		}
 		$this->FixVisibleColumns();		
 	}
-	
+
+	/**
+	 * @param $aClassAliases
+	 * @param $bViewLink
+	 * @param $aDefaultLists
+	 *
+	 * @return \DataTableSettings
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
 	static public function GetDataModelSettings($aClassAliases, $bViewLink, $aDefaultLists)
 	{
 		$oSettings = new DataTableSettings($aClassAliases);
@@ -762,7 +1004,10 @@ class DataTableSettings implements Serializable
 		$oSettings->Init($iDefaultPageSize, $aSortOrder, $aColumns);
 		return $oSettings;
 	}
-	
+
+	/**
+	 * @throws \CoreException
+	 */
 	protected function FixVisibleColumns()
 	{
 		foreach($this->aClassAliases as $sAlias => $sClass)
@@ -799,7 +1044,15 @@ class DataTableSettings implements Serializable
 			}
 		}		
 	}
-	
+
+	/**
+	 * @param $aClassAliases
+	 * @param null $sTableId
+	 * @param bool $bOnlyOnTable
+	 *
+	 * @return \DataTableSettings|null
+	 * @throws \Exception
+	 */
 	static public function GetTableSettings($aClassAliases, $sTableId = null, $bOnlyOnTable = false)
 	{
 		$pref = null;
@@ -828,7 +1081,10 @@ class DataTableSettings implements Serializable
 		
 		return $oSettings;
 	}
-	
+
+	/**
+	 * @return array
+	 */
 	public function GetSortOrder()
 	{
 		$aSortOrder = array();
@@ -846,7 +1102,12 @@ class DataTableSettings implements Serializable
 		}
 		return $aSortOrder;
 	}
-	
+
+	/**
+	 * @param null $sTargetTableId
+	 *
+	 * @return bool
+	 */
 	public function Save($sTargetTableId = null)
 	{
 		$sSaveId = is_null($sTargetTableId) ? $this->sTableId : $sTargetTableId;
@@ -857,6 +1118,9 @@ class DataTableSettings implements Serializable
 		return true;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function SaveAsDefault()
 	{
 		$sSettings = $this->serialize();
@@ -886,7 +1150,12 @@ class DataTableSettings implements Serializable
 		}
 		return true;
 	}
-	
+
+	/**
+	 * @param null $sTableId
+	 *
+	 * @return string
+	 */
 	protected function GetPrefsKey($sTableId = null)
 	{
 		if ($sTableId == null) $sTableId = '*';
@@ -897,7 +1166,18 @@ class DataTableSettings implements Serializable
 		}
 		return implode('/', $aKeys).'|'.$sTableId;
 	}
-	
+
+	/**
+	 * @param $sAlias
+	 * @param $sAttCode
+	 * @param $oAttDef
+	 * @param $bChecked
+	 * @param $sSort
+	 *
+	 * @return array|bool
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
 	protected function GetFieldData($sAlias, $sAttCode, $oAttDef, $bChecked, $sSort)
 	{
 		$ret = false;

application/displayblock.class.inc.php

@@ -1,26 +1,20 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
- * DisplayBlock and derived class
+ * Copyright (C) 2013-2019 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT.'/application/webpage.class.inc.php');
@@ -91,7 +85,7 @@ class DisplayBlock
 	{
 		$oDummyFilter = new DBObjectSearch($oSet->GetClass());
 		$aKeys = array();
-		$oSet->OptimizeColumnLoad(array('id')); // No need to load all the columns just to get the id
+		$oSet->OptimizeColumnLoad(array($oSet->GetClassAlias() => array())); // No need to load all the columns just to get the id
 		while($oObject = $oSet->Fetch())
 		{
 			$aKeys[] = $oObject->GetKey();	
@@ -1886,11 +1880,11 @@ class MenuBlock extends DisplayBlock
 		{
 			if (count($aFavoriteActions) > 0)
 			{
-				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."\n<ul>\n";
+				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."<i class=\"fas fa-caret-down\"></i>"."\n<ul>\n";
 			}
 			else
 			{
-				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
+				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."<i class=\"fas fa-caret-down\"></i>"."\n<ul>\n";
 			}
 
 			$sHtml .= $oPage->RenderPopupMenuItems($aActions, $aFavoriteActions);

application/forms.class.inc.php

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

application/itopwebpage.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2018 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 iTopWebPage
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT."/application/nicewebpage.class.inc.php");
@@ -46,11 +39,19 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 	protected $sBreadCrumbEntryIcon;
 	protected $oCtx;
 
+	/**
+	 * iTopWebPage constructor.
+	 *
+	 * @param string $sTitle
+	 * @param bool $bPrintable
+	 *
+	 * @throws \Exception
+	 */
 	public function __construct($sTitle, $bPrintable = false)
 	{
 		parent::__construct($sTitle, $bPrintable);
 		$this->m_oTabs = new TabManager();
-		$this->oCtx = new ContextTag('GUI:Console');
+		$this->oCtx = new ContextTag(ContextTag::TAG_CONSOLE);
 
 		ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
 
@@ -150,6 +151,9 @@ EOF
 		}
 	}
 
+	/**
+	 * @return bool
+	 */
 	protected function IsMenuPaneVisible()
 	{
 		$bLeftPaneOpen = true;
@@ -172,6 +176,9 @@ EOF
 		return $bLeftPaneOpen;
 	}
 
+	/**
+	 *
+	 */
 	protected function PrepareLayout()
 	{
 		if (MetaModel::GetConfig()->Get('demo_mode'))
@@ -736,11 +743,22 @@ JS
 		$this->sBreadCrumbEntryIcon = null;
 	}
 
+	/**
+	 * @param string $sHtml
+	 */
 	public function AddToMenu($sHtml)
 	{
 		$this->m_sMenu .= $sHtml;
 	}
 
+	/**
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
+	 */
 	public function GetSiloSelectionForm()
 	{
 		// List of visible Organizations
@@ -801,6 +819,9 @@ JS
 		return $sHtml;
 	}
 
+	/**
+	 * @throws \DictExceptionMissingString
+	 */
 	public function DisplayMenu()
 	{
 		// Display the menu
@@ -816,6 +837,8 @@ JS
 	protected function InitNewsroom()
 	{
 		$sNewsroomInitialImage = '';
+		$aProviderParams = array();
+
 		if (MetaModel::GetConfig()->Get('newsroom_enabled') !== false)
 	 	{
 			$oUser = UserRights::GetUserObject();
@@ -823,30 +846,31 @@ JS
 			 * @var iNewsroomProvider[] $aProviders
 			 */
 			$aProviders = MetaModel::EnumPlugins('iNewsroomProvider');
-			$aProviderParams = array();
 			foreach($aProviders as $oProvider)
 			{
 				$oProvider->SetConfig(MetaModel::GetConfig());
-				$bProviderEnabled = appUserPreferences::GetPref('newsroom_provider_'.get_class($oProvider), true);
-			if ($bProviderEnabled && $oProvider->IsApplicable($oUser))
-			{
-				$aProviderParams[] = array(
-					'label' => $oProvider->GetLabel(),
-					'fetch_url' => $oProvider->GetFetchURL(),
-					'view_all_url' => $oProvider->GetViewAllURL(),
-					'mark_all_as_read_url' => $oProvider->GetMarkAllAsReadURL(),
-					'placeholders' => $oProvider->GetPlaceholders(),
-					'ttl' => $oProvider->GetTTL(),
-				);
+				$bProviderEnabled = appUserPreferences::GetPref('newsroom_provider_'.get_class($oProvider),true);
+				if ($bProviderEnabled && $oProvider->IsApplicable($oUser))
+				{
+					$aProviderParams[] = array(
+						'label' => $oProvider->GetLabel(),
+						'fetch_url' => $oProvider->GetFetchURL(),
+						'view_all_url' => $oProvider->GetViewAllURL(),
+						'mark_all_as_read_url' => $oProvider->GetMarkAllAsReadURL(),
+						'placeholders' => $oProvider->GetPlaceholders(),
+						'ttl' => $oProvider->GetTTL(),
+					);
+				}
 			}
 		}
+		// Show newsroom only if there are some providers
 		if (count($aProviderParams) > 0)
 		{
-			$sImageUrl= '../images/newsroom_menu.png';
-			$sPlaceholderImageUrl= '../images/newsroom-message.svg';
+			$sImageUrl= 'fas fa-comment-dots';
+			$sPlaceholderImageUrl= 'far fa-envelope';
 			$aParams = array(
-				'image_url' => $sImageUrl,
-				'placeholder_image_url' => $sPlaceholderImageUrl,
+				'image_icon' => $sImageUrl,
+				'placeholder_image_icon' => $sPlaceholderImageUrl,
 				'cache_uuid' => 'itop-newsroom-'.UserRights::GetUserId().'-'.md5(APPROOT),
 				'providers' => $aProviderParams,
 				'display_limit' => (int)appUserPreferences::GetPref('newsroom_display_size', 7),
@@ -862,20 +886,16 @@ JS
 	$('#top-left-newsroom-cell').newsroom_menu($sParams);
 EOF
 			);
-			$sNewsroomInitialImage = '<img style="opacity:0.4" src="../images/newsroom_menu.png">';
+			$sNewsroomInitialImage = '<i style="opacity:0.4" class="top-right-icon fas fa-comment-dots"></i>';
 		}
-		else
-		{
-			// No newsroom menu at all
-		}
-	}
-	// else no newsroom menu
-	return $sNewsroomInitialImage;
+		// else no newsroom menu
+		return $sNewsroomInitialImage;
 	}
 
 
 	/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
+	 * @inheritDoc
+	 * @throws \Exception
 	 */
 	public function output()
 	{
@@ -1109,7 +1129,7 @@ EOF
 		{
 			$sBodyClass = 'printable-version';
 		}
-		$sHtml .= "<body class=\"$sBodyClass\">\n";
+		$sHtml .= "<body class=\"$sBodyClass\" data-gui-type=\"backoffice\">\n";
 		if ($this->IsPrintableVersion())
 		{
 			$sHtml .= "<div class=\"explain-printable not-printable\">";
@@ -1146,7 +1166,7 @@ EOF;
 		}
 
 		// Render the revision number
-		if (ITOP_REVISION == '$WCREV$')
+		if (ITOP_REVISION == 'svn')
 		{
 			// This is NOT a version built using the buil system, just display the main version
 			$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
@@ -1182,7 +1202,7 @@ EOF;
 			{
 				$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);
 			}
-			$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/on-off-menu.png\"><ul>";
+			$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><i class=\"top-right-icon icon-additional-arrow fas fa-power-off\"></i><ul>";
 			$sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
 			$aActions = array();
 
@@ -1344,10 +1364,10 @@ EOF;
 			$sHtml .= ' <table id="top-bar-table">';
 			$sHtml .= ' <tr>';
 			$sHtml .= ' <td id="open-left-pane"  class="menu-pane-exclusive" style="'.$GoHomeInitialStyle.'" onclick="$(\'body\').layout().open(\'west\');">';
-			$sHtml .= ' <img src="../images/menu.png">';
+			$sHtml .= ' <i class="fas fa-bars"></i>';
 			$sHtml .= ' </td>';
 			$sHtml .= ' <td id="go-home" class="menu-pane-exclusive" style="'.$GoHomeInitialStyle.'">';
-			$sHtml .= ' <a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><img src="../images/home.png"></a>';
+			$sHtml .= ' <a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><i class="fas fa-home"></i></a>';
 			$sHtml .= ' </td>';
 			$sHtml .= ' <td class="top-bar-spacer menu-pane-exclusive" style="'.$GoHomeInitialStyle.'">';
 			$sHtml .= ' </td>';
@@ -1357,8 +1377,8 @@ EOF;
 			$sHtml .= ' <td id="top-bar-table-search">';
 			$sHtml .= '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php">';
 			$sHtml .= '		<table id="top-left-buttons-area"><tr>';
-			$sHtml .= '			<td id="top-left-global-search-cell"><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="'.$sDefaultPlaceHolder.'" value="'.$sText.'"></input><div '.$sOnClick.' id="global-search-image"><input type="hidden" name="operation" value="full_text"/></div></div></td>';
-			$sHtml .= '     	<td id="top-left-help-cell"><a id="help-link" href="'.$sOnlineHelpUrl.'" target="_blank"><img title="'.Dict::S('UI:Help').'" src="../images/help.png?t='.utils::GetCacheBusterTimestamp().'"/></td>';
+			$sHtml .= '			<td id="top-left-global-search-cell"><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="'.$sDefaultPlaceHolder.'" value="'.$sText.'"></input><div '.$sOnClick.' id="global-search-image"><i class="top-right-icon fa-flip-horizontal fas fa-search"></i><input type="hidden" name="operation" value="full_text"/></div></div></td>';
+			$sHtml .= '     	<td id="top-left-help-cell"><a id="help-link" href="'.$sOnlineHelpUrl.'" target="_blank" title="'.Dict::S('UI:Help').'"><i class="top-right-icon fas fa-question-circle"></i></a></td>';
 			$sHtml .= '		<td id="top-left-newsroom-cell">'.$sNewsRoomInitialImage.'</td>';
 			$sHtml .= '     	<td id="top-left-logoff-cell">'.self::FilterXSS($sLogOffMenu).'</td>';
 			$sHtml .= '     </tr></table></form></div>';
@@ -1413,9 +1433,12 @@ EOF;
 		{
 			if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf'))
 			{
+				// Note: Apparently this was a demand from ITOMIG a while back, so it's not "dead code" per say.
+				// The last trace we got is in R-007989. Do not remove this without checking before with the concerned parties if it is still used!
 				if (@is_readable(APPROOT.'lib/MPDF/mpdf.php'))
 				{
 					require_once(APPROOT.'lib/MPDF/mpdf.php');
+					/** @noinspection PhpUndefinedClassInspection Check above comment */
 					$oMPDF = new mPDF('c');
 					$oMPDF->mirroMargins = false;
 					if ($this->a_base['href'] != '')
@@ -1442,59 +1465,68 @@ EOF;
 		ExecutionKPI::ReportStats();
 	}
 
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
 		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
 	}
 
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
+	public function AddToTab($sTabContainer, $sTabCode, $sHtml)
 	{
-		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabCode, $sHtml));
 	}
 
+	/**
+	 * @inheritDoc
+	 */
 	public function SetCurrentTabContainer($sTabContainer = '')
 	{
 		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
 	}
 
-	public function SetCurrentTab($sTabLabel = '')
+	/**
+	 * @inheritDoc
+	 */
+	public function SetCurrentTab($sTabCode = '', $sTabTitle = null)
 	{
-		return $this->m_oTabs->SetCurrentTab($sTabLabel);
+		return $this->m_oTabs->SetCurrentTab($sTabCode, $sTabTitle);
 	}
 
 	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 *
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from
-	 * another server. Static content cannot be added inside such tabs.
-	 *
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be
-	 *     reloaded upon each activation.
-	 *
+	 * @inheritDoc
+	 * @throws \Exception
 	 * @since 2.0.3
 	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	public function AddAjaxTab($sTabCode, $sUrl, $bCache = true, $sTabTitle = null)
 	{
-		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+		$this->add($this->m_oTabs->AddAjaxTab($sTabCode, $sUrl, $bCache, $sTabTitle));
 	}
 
+	/**
+	 * @inheritDoc
+	 */
 	public function GetCurrentTab()
 	{
 		return $this->m_oTabs->GetCurrentTab();
 	}
 
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	/**
+	 * @inheritDoc
+	 */
+	public function RemoveTab($sTabCode, $sTabContainer = null)
 	{
-		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+		$this->m_oTabs->RemoveTab($sTabCode, $sTabContainer);
 	}
 
 	/**
-	 * Finds the tab whose title matches a given pattern
-	 *
-	 * @return mixed The name of the tab as a string or false if not found
+	 * @inheritDoc
 	 */
 	public function FindTab($sPattern, $sTabContainer = null)
 	{
@@ -1506,12 +1538,19 @@ EOF;
 	 * DOES NOT WORK: apparently in the *old* version of jquery
 	 * that we are using this is not supported... TO DO upgrade
 	 * the whole jquery bundle...
+	 *
+	 * @param string $sTabContainer
+	 * @param string $sTabCode
 	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
+	public function SelectTab($sTabContainer, $sTabCode)
 	{
-		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
 	}
 
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
 	public function add($sHtml)
 	{
 		if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
@@ -1525,9 +1564,7 @@ EOF;
 	}
 
 	/**
-	 * Records the current state of the 'html' part of the page output
-	 *
-	 * @return mixed The current state of the 'html' output
+	 * @inheritDoc
 	 */
 	public function start_capture()
 	{
@@ -1547,12 +1584,7 @@ EOF;
 	}
 
 	/**
-	 * Returns the part of the html output that occurred since the call to start_capture
-	 * and removes this part from the current html output
-	 *
-	 * @param $offset mixed The value returned by start_capture
-	 *
-	 * @return string The part of the html output that was added since the call to start_capture
+	 * @inheritDoc
 	 */
 	public function end_capture($offset)
 	{
@@ -1577,6 +1609,8 @@ EOF;
 
 	/**
 	 * Set the message to be displayed in the 'app-banner' section at the top of the page
+	 *
+	 * @param string $sHtmlMessage
 	 */
 	public function SetMessage($sHtmlMessage)
 	{
@@ -1586,6 +1620,10 @@ EOF;
 
 	/**
 	 * Add message to be displayed in the 'app-banner' section at the top of the page
+	 *
+	 * @param string $sHtmlMessage
+	 * @param string|null $sHtmlIcon
+	 * @param string|null $sTip
 	 */
 	public function AddApplicationMessage($sHtmlMessage, $sHtmlIcon = null, $sTip = null)
 	{
@@ -1606,6 +1644,7 @@ EOF;
 	 * @param string $sContent
 	 * @param string $sCssClasses CSS classes to add to the container
 	 *
+	 * @throws \Exception
 	 * @since 2.6
 	 */
 	public function AddHeaderMessage($sContent, $sCssClasses = 'message_info')
@@ -1619,6 +1658,8 @@ EOF
 	/**
 	 * Adds a script to be executed when the DOM is ready (typical JQuery use), right before add_ready_script
 	 *
+	 * @param string $sScript
+	 *
 	 * @return void
 	 */
 	public function add_init_script($sScript)

application/loginform.class.inc.php

@@ -7,7 +7,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
+class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 {
 	private $bForceFormOnError = false;
 
@@ -105,14 +105,14 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
 	}
 
 	/**
-	 * @return LoginTwigData
+	 * @return LoginTwigContext
 	 * @throws \Exception
 	 */
-	public function GetLoginData()
+	public function GetTwigContext()
 	{
-
-		$aPostedVars = array('auth_user', 'auth_pwd');
-		$oLoginData = new LoginTwigData($aPostedVars);
+		$oLoginContext = new LoginTwigContext();
+		$oLoginContext->AddPostedVar('auth_user');
+		$oLoginContext->AddPostedVar('auth_pwd');
 
 		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
 		$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
@@ -121,19 +121,18 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
 			'sAuthUser' => $sAuthUser,
 			'sAuthPwd' => $sAuthPwd,
 		);
-		$oLoginData->AddBlockData('login_input', new LoginBlockData('loginforminput.html.twig', $aData));
-		$oLoginData->AddBlockData('login_submit', new LoginBlockData('loginformsubmit.html.twig'));
-		$oLoginData->AddBlockData('login_form_footer', new LoginBlockData('loginformfooter.html.twig'));
+		$oLoginContext->AddBlockExtension('login_input', new LoginBlockExtension('extensionblock/loginforminput.html.twig', $aData));
+		$oLoginContext->AddBlockExtension('login_submit', new LoginBlockExtension('extensionblock/loginformsubmit.html.twig'));
+		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = empty(MetaModel::GetConfig()->Get('forgot_password')) ? true : MetaModel::GetConfig()->Get('forgot_password');
 		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
-
 		$aData = array(
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,
 		);
-		$oLoginData->AddBlockData('login_links', new LoginBlockData('loginformlinks.html.twig', $aData));
+		$oLoginContext->AddBlockExtension('login_links', new LoginBlockExtension('extensionblock/loginformlinks.html.twig', $aData));
 
-		return $oLoginData;
+		return $oLoginContext;
 	}
 }

application/logintwig.class.inc.php

@@ -9,61 +9,130 @@
 
 use Combodo\iTop\TwigExtension;
 
-class LoginTwigData
+/**
+ * Twig context for modules extending the login screen
+ * Class LoginTwigContext
+ */
+class LoginTwigContext
 {
-	private $aBlockData;
+	/** @var array */
+	private $aBlockExtension;
+	/** @var array */
 	private $aPostedVars;
+	/** @var string  */
 	private $sTwigLoaderPath;
-	private $sCSSFile;
+	/** @var array */
+	private $aCSSFiles;
 	/** @var array */
 	private $aJsFiles;
+	private $sTwigNameSpace;
 
 	/**
-	 * LoginTwigData constructor.
+	 * Build a context to display the twig files used
+	 * to extend the login screens
 	 *
-	 * @param array $aPostedVars
-	 * @param string $sLoaderPath
-	 * @param string $sCSSFile
-	 * @param array $aJsFiles
+	 * LoginTwigContext constructor.
+	 * @api
 	 */
-	public function __construct($aPostedVars = array(), $sLoaderPath = null, $sCSSFile = null, $aJsFiles = array())
+	public function __construct()
 	{
-		$this->aBlockData = array();
-		$this->aPostedVars = $aPostedVars;
-		$this->sTwigLoaderPath = $sLoaderPath;
-		$this->sCSSFile = $sCSSFile;
-		$this->aJsFiles = $aJsFiles;
+		$this->aBlockExtension = array();
+		$this->aPostedVars = array();
+		$this->sTwigLoaderPath = null;
+		$this->aCSSFiles = array();
+		$this->aJsFiles = array();
+		$this->sTwigNameSpace = null;
+	}
+
+	/**
+	 * Set the absolute path on disk of the folder containing the twig templates
+	 *
+	 * @param string $sPath absolute path of twig templates directory
+	 * @api
+	 */
+	public function SetLoaderPath($sPath)
+	{
+		$this->sTwigLoaderPath = $sPath;
+	}
+
+	/**
+	 * Add a Twig block extension
+	 *
+	 * @param string $sBlockName
+	 * @param LoginBlockExtension $oBlockExtension
+	 */
+	public function AddBlockExtension($sBlockName, $oBlockExtension)
+	{
+		$this->aBlockExtension[$sBlockName] = $oBlockExtension;
+	}
+
+	/**
+	 * Add a variable intended to be posted on URL (and managed) by the module.
+	 * Declaring the posted variables will prevent the core engine to manipulate these variables.
+	 *
+	 * @param string $sPostedVar Name of the posted variable
+	 * @api
+	 */
+	public function AddPostedVar($sPostedVar)
+	{
+		$this->aPostedVars[] = $sPostedVar;
+	}
+
+	/**
+	 * Add the URL of a CSS file to link to the login screen
+	 *
+	 * @param string $sFile URL of the CSS file to link
+	 * @api
+	 */
+	public function AddCSSFile($sFile)
+	{
+		$this->aCSSFiles[] = $sFile;
+	}
+
+	/**
+	 * Add the URL of a javascript file to link to the login screen
+	 * @param string $sFile URL of the javascript file to link
+	 * @api
+	 */
+	public function AddJsFile($sFile)
+	{
+		$this->aJsFiles[] = $sFile;
 	}
 
 	/**
 	 * @param string $sBlockName
-	 * @param LoginBlockData $oBlockData
+	 *
+	 * @return \LoginBlockExtension
 	 */
-	public final function AddBlockData($sBlockName, $oBlockData)
+	public function GetBlockExtension($sBlockName)
 	{
-		$this->aBlockData[$sBlockName] = $oBlockData;
+		/** @var LoginBlockExtension $oBlockExtension */
+		$oBlockExtension = isset($this->aBlockExtension[$sBlockName]) ? $this->aBlockExtension[$sBlockName] : null;
+		return $oBlockExtension;
 	}
 
-	public final function GetBlockData($sBlockName)
-	{
-		/** @var LoginBlockData $oBlockData */
-		$oBlockData = isset($this->aBlockData[$sBlockName]) ? $this->aBlockData[$sBlockName] : null;
-		return $oBlockData;
-	}
-
-	public final function GetPostedVars()
+	/**
+	 * @return array
+	 */
+	public function GetPostedVars()
 	{
 		return $this->aPostedVars;
 	}
 
-	public final function GetTwigLoaderPath()
+	/**
+	 * @return string
+	 */
+	public function GetTwigLoaderPath()
 	{
 		return $this->sTwigLoaderPath;
 	}
 
-	public final function GetCSSFile()
+	/**
+	 * @return array
+	 */
+	public function GetCSSFiles()
 	{
-		return $this->sCSSFile;
+		return $this->aCSSFiles;
 	}
 
 	/**
@@ -73,18 +142,33 @@ class LoginTwigData
 	{
 		return $this->aJsFiles;
 	}
+
 }
 
-class LoginBlockData
+/**
+ * Twig block description for login screen extension
+ * The login screen can be extended by adding twig templates
+ * to specific blocks of the login screens
+ *
+ * Class LoginBlockExtension
+ */
+class LoginBlockExtension
 {
 	private $sTwig;
 	private $aData;
 
 	/**
-	 * LoginBlockData constructor.
+	 * Create a new twig extension block
+	 * The given twig template can be HTML, CSS or JavaScript.
+	 * CSS goes to the block named 'css' and is inline in the page.
+	 * JavaScript goes to the blocks named 'script' or 'ready_script' and are inline in the page.
+	 * HTML goes to everywhere else
 	 *
-	 * @param string $sTwig
-	 * @param array $aData
+	 * LoginBlockExtension constructor.
+	 *
+	 * @param string $sTwig name of the twig file relative to the path given to the LoginTwigContext
+	 * @param array $aData Data given to the twig template (into the variable {{ aData }})
+	 * @api
 	 */
 	public function __construct($sTwig, $aData = array())
 	{
@@ -92,18 +176,22 @@ class LoginBlockData
 		$this->aData = $aData;
 	}
 
-	public final function GetTwig()
+	public function GetTwig()
 	{
 		return $this->sTwig;
 	}
 
-	public final function GetData()
+	public function GetData()
 	{
 		return $this->aData;
 	}
 }
 
-class LoginTwigContext
+/**
+ * Used by LoginWebPage to display the login screen
+ * Class LoginTwigRenderer
+ */
+class LoginTwigRenderer
 {
 	private $aLoginPluginList;
 	private $aPluginFormData;
@@ -112,21 +200,27 @@ class LoginTwigContext
 
 	public function __construct()
 	{
-		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginDataExtension', false);
+		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginUIExtension', false);
 		$this->aPluginFormData = array();
 		$aTwigLoaders = array();
 		$this->aPostedVars = array();
 		foreach ($this->aLoginPluginList as $oLoginPlugin)
 		{
-			/** @var \iLoginDataExtension $oLoginPlugin */
-			$oLoginData = $oLoginPlugin->GetLoginData();
-			$this->aPluginFormData[] = $oLoginData;
-			$sTwigLoaderPath = $oLoginData->GetTwigLoaderPath();
+			/** @var \iLoginUIExtension $oLoginPlugin */
+			$oLoginContext = $oLoginPlugin->GetTwigContext();
+			if (is_null($oLoginContext))
+			{
+				continue;
+			}
+			$this->aPluginFormData[] = $oLoginContext;
+			$sTwigLoaderPath = $oLoginContext->GetTwigLoaderPath();
 			if ($sTwigLoaderPath != null)
 			{
-				$aTwigLoaders[] = new Twig_Loader_Filesystem($sTwigLoaderPath);
+				$oExtensionLoader = new Twig_Loader_Filesystem();
+				$oExtensionLoader->setPaths($sTwigLoaderPath);
+				$aTwigLoaders[] = $oExtensionLoader;
 			}
-			$this->aPostedVars = array_merge($this->aPostedVars, $oLoginData->GetPostedVars());
+			$this->aPostedVars = array_merge($this->aPostedVars, $oLoginContext->GetPostedVars());
 		}
 
 		$oCoreLoader = new Twig_Loader_Filesystem(array(), APPROOT.'templates');
@@ -178,9 +272,9 @@ class LoginTwigContext
 		// Render CSS links
 		foreach ($this->aPluginFormData as $oFormData)
 		{
-			/** @var \LoginTwigData $oFormData */
-			$sCSSFile = $oFormData->GetCSSFile();
-			if (!empty($sCSSFile))
+			/** @var \LoginTwigContext $oFormData */
+			$aCSSFiles = $oFormData->GetCSSFiles();
+			foreach ($aCSSFiles as $sCSSFile)
 			{
 				$oPage->add_linked_stylesheet($sCSSFile);
 			}
@@ -224,4 +318,4 @@ class LoginTwigContext
 	{
 		return $this->oTwig;
 	}
-}
+}

application/loginwebpage.class.inc.php

@@ -118,7 +118,7 @@ class LoginWebPage extends NiceWebPage
 
 	public function DisplayLoginForm($bFailedLogin = false)
 	{
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aPostedVars = array_merge(array('login_mode', 'loginop'), $oTwigContext->GetPostedVars());
 
 		$sMessage = Dict::S('UI:Login:IdentifyYourself');
@@ -171,7 +171,7 @@ class LoginWebPage extends NiceWebPage
 	{
 		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
 
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aVars = $oTwigContext->GetDefaultVars();
 		$aVars['sAuthUser'] = $sAuthUser;
 		$aVars['bFailedToReset'] = $bFailedToReset;
@@ -189,53 +189,54 @@ class LoginWebPage extends NiceWebPage
 			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
             /** @var UserInternal $oUser */
             $oUser = UserRights::GetUserObject();
-			if ($oUser == null)
+
+			if ($oUser != null)
 			{
-				throw new Exception(Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser));
-			}
-			if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token'))
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
-			}
-			if (!$oUser->CanChangePassword())
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
-			}
-			
-			$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
-			if ($sTo == '')
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
+				if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token'))
+				{
+					throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
+				}
+				if (!$oUser->CanChangePassword())
+				{
+					throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
+				}
+
+				$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
+				if ($sTo == '')
+				{
+					throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
+				}
+
+				// This token allows the user to change the password without knowing the previous one
+				$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
+				$oUser->Set('reset_pwd_token', $sToken);
+				CMDBObject::SetTrackInfo('Reset password');
+				$oUser->AllowWrite(true);
+				$oUser->DBUpdate();
+
+				$oEmail = new Email();
+				$oEmail->SetRecipientTO($sTo);
+				$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
+				$oEmail->SetRecipientFrom($sFrom);
+				$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject', $oUser->Get('login')));
+				$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
+				$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl, $oUser->Get('login')));
+				$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
+				switch ($iRes)
+				{
+					//case EMAIL_SEND_PENDING:
+					case EMAIL_SEND_OK:
+						break;
+
+					case EMAIL_SEND_ERROR:
+					default:
+						IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
+						throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
+				}
 			}
 
-			// This token allows the user to change the password without knowing the previous one
-			$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
-			$oUser->Set('reset_pwd_token', $sToken);
-			CMDBObject::SetTrackInfo('Reset password');
-			$oUser->AllowWrite(true);
-			$oUser->DBUpdate();
 
-			$oEmail = new Email();
-			$oEmail->SetRecipientTO($sTo);
-			$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject', $oUser->Get('login')));
-			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
-			$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl, $oUser->Get('login')));
-			$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
-			switch ($iRes)
-			{
-				//case EMAIL_SEND_PENDING:
-				case EMAIL_SEND_OK:
-					break;
-		
-				case EMAIL_SEND_ERROR:
-				default:
-					IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
-					throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
-			}
-
-			$oTwigContext = new LoginTwigContext();
+			$oTwigContext = new LoginTwigRenderer();
 			$aVars = $oTwigContext->GetDefaultVars();
 			$oTwigContext->Render($this, 'forgotpwdsent.html.twig', $aVars);
 		}
@@ -245,7 +246,7 @@ class LoginWebPage extends NiceWebPage
 		}
 	}
 
-	public function DisplayResetPwdForm()
+	public function DisplayResetPwdForm($sErrorMessage = null)
 	{
 		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 		$sToken = utils::ReadParam('token', '', false, 'raw_data');
@@ -253,11 +254,13 @@ class LoginWebPage extends NiceWebPage
 		UserRights::Login($sAuthUser); // Set the user's language
 		$oUser = UserRights::GetUserObject();
 
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aVars = $oTwigContext->GetDefaultVars();
 
 		$aVars['sAuthUser'] = $sAuthUser;
 		$aVars['sToken'] = $sToken;
+		$aVars['sErrorMessage'] = $sErrorMessage;
+
 		if (($oUser == null))
 		{
 			$aVars['bNoUser'] = true;
@@ -265,6 +268,7 @@ class LoginWebPage extends NiceWebPage
 		else
 		{
 			$aVars['bNoUser'] = false;
+			$aVars['sUserName'] = $oUser->GetFriendlyName();
 			$oEncryptedToken = $oUser->Get('reset_pwd_token');
 
 			if (!$oEncryptedToken->CheckPassword($sToken))
@@ -274,7 +278,6 @@ class LoginWebPage extends NiceWebPage
 			else
 			{
 				$aVars['bBadToken'] = false;
-				$aVars['sUserName'] = $oUser->GetFriendlyName();
 			}
 		}
 
@@ -288,9 +291,10 @@ class LoginWebPage extends NiceWebPage
 		$sNewPwd = utils::ReadPostedParam('new_pwd', '', 'raw_data');
 
 		UserRights::Login($sAuthUser); // Set the user's language
+		/** @var \UserLocal $oUser */
 		$oUser = UserRights::GetUserObject();
 
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aVars = $oTwigContext->GetDefaultVars();
 
 		$aVars['sAuthUser'] = $sAuthUser;
@@ -322,11 +326,12 @@ class LoginWebPage extends NiceWebPage
 		$oTwigContext->Render($this, 'resetpwddone.html.twig', $aVars);
 	}
 
-	public function DisplayChangePwdForm($bFailedLogin = false)
+	public function DisplayChangePwdForm($bFailedLogin = false, $sIssue = null)
 	{
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aVars = $oTwigContext->GetDefaultVars();
 		$aVars['bFailedLogin'] = $bFailedLogin;
+		$aVars['sIssue'] = $sIssue;
 		$oTwigContext->Render($this, 'changepwdform.html.twig', $aVars);
 	}
 
@@ -337,7 +342,7 @@ class LoginWebPage extends NiceWebPage
 		$sTitle = empty($sTitle) ? Dict::S('UI:LogOff:ThankYou') : $sTitle;
 		$sMessage = Dict::S('UI:LogOff:ClickHereToLoginAgain');
 
-		$oTwigContext = new LoginTwigContext();
+		$oTwigContext = new LoginTwigRenderer();
 		$aVars = $oTwigContext->GetDefaultVars();
 		$aVars['sUrl'] = $sUrl;
 		$aVars['sTitle'] = $sTitle;
@@ -410,6 +415,7 @@ class LoginWebPage extends NiceWebPage
 		if ($bLoginDebug)
 		{
 			IssueLog::Info("---------------------------------");
+			IssueLog::Info($_SERVER['REQUEST_URI']);
 			IssueLog::Info("--> Entering Login FSM with state: [$sLoginState]");
 			$sSessionLog = session_id().' '.utils::GetSessionLog();
 			IssueLog::Info("SESSION: $sSessionLog");
@@ -494,6 +500,7 @@ class LoginWebPage extends NiceWebPage
 		foreach (MetaModel::EnumPlugins($sInterface) as $oLoginExtensionInstance)
 		{
 			$aLoginModes = $oLoginExtensionInstance->ListSupportedLoginModes();
+			$aLoginModes = (is_array($aLoginModes) ? $aLoginModes : array());
 			foreach ($aLoginModes as $sLoginMode)
 			{
 				// Keep only the plugins for the current login mode + before + after
@@ -783,6 +790,13 @@ class LoginWebPage extends NiceWebPage
 		$oPerson = null;
 		try
 		{
+			$sOrigin = 'External User provisioning';
+			if (isset($_SESSION['login_mode']))
+			{
+				$sOrigin .= " ({$_SESSION['login_mode']})";
+			}
+			CMDBObject::SetTrackOrigin($sOrigin);
+
 			$oPerson = MetaModel::NewObject('Person');
 			$oPerson->Set('first_name', $sFirstName);
 			$oPerson->Set('name', $sLastName);
@@ -797,17 +811,7 @@ class LoginWebPage extends NiceWebPage
 			{
 				$oPerson->Set($sAttCode, $sValue);
 			}
-			/** @var CMDBChange $oMyChange */
-			$oMyChange = MetaModel::NewObject('CMDBChange');
-			$oMyChange->Set("date", time());
-			$sOrigin = 'External User provisioning';
-			if (isset($_SESSION['login_mode']))
-			{
-				$sOrigin .= " ({$_SESSION['login_mode']})";
-			}
-			$oMyChange->Set('userinfo', $sOrigin);
-			$oMyChange->DBInsert();
-			$oPerson->DBInsertTracked($oMyChange);
+			$oPerson->DBInsert();
 		}
 		catch (Exception $e)
 		{
@@ -889,19 +893,7 @@ class LoginWebPage extends NiceWebPage
 			$oUser->Set('profile_list', $oProfilesSet);
 			if ($oUser->IsModified())
 			{
-				/** @var \CMDBChange $oMyChange */
-				$oMyChange = MetaModel::NewObject("CMDBChange");
-				$oMyChange->Set("date", time());
-				$oMyChange->Set('userinfo', $sOrigin);
-				$oMyChange->DBInsert();
-				if ($oUser->IsNew())
-				{
-					$oUser->DBInsertTracked($oMyChange);
-				}
-				else
-				{
-					$oUser->DBUpdateTracked($oMyChange);
-				}
+				$oUser->DBWrite();
 			}
 		}
 		catch (Exception $e)
@@ -938,6 +930,7 @@ class LoginWebPage extends NiceWebPage
 			{
 				// No rights to be here, redirect to the portal
 				header('Location: '.$ret);
+				die();
 			}
 		}
 		return self::EXIT_CODE_OK;
@@ -1044,8 +1037,17 @@ class LoginWebPage extends NiceWebPage
 		}
 		else if ($operation == 'do_reset_pwd')
 		{
-			$oPage = self::NewLoginWebPage();
-			$oPage->DoResetPassword();
+
+			try {
+				$oPage = self::NewLoginWebPage();
+				$oPage->DoResetPassword();
+			}
+			catch (CoreCannotSaveObjectException $e)
+			{
+				$oPage = self::NewLoginWebPage();
+				$oPage->DisplayResetPwdForm($e->getIssue());
+			}
+
 			$oPage->output();
 			exit;
 		}
@@ -1061,6 +1063,24 @@ class LoginWebPage extends NiceWebPage
 				exit;
 			}
 		}
+		else if ($operation == 'check_pwd_policy')
+		{
+			$sAuthUser = $_SESSION['auth_user'];
+			UserRights::Login($sAuthUser); // Set the user's language
+
+			$aPwdMap = array();
+
+			foreach (array('new_pwd', 'retype_new_pwd') as $postedPwd)
+			{
+				$oUser = new UserLocal();
+				$oUser->ValidatePassword($_POST[$postedPwd]);
+
+				$aPwdMap[$postedPwd]['isValid'] = $oUser->IsPasswordValid();
+				$aPwdMap[$postedPwd]['message'] = $oUser->getPasswordValidityMessage();
+			}
+			echo json_encode($aPwdMap);
+			die();
+		}
 		if ($operation == 'do_change_pwd')
 		{
 			if (isset($_SESSION['auth_user']))
@@ -1069,10 +1089,21 @@ class LoginWebPage extends NiceWebPage
 				UserRights::Login($sAuthUser); // Set the user's language
 				$sOldPwd = utils::ReadPostedParam('old_pwd', '', 'raw_data');
 				$sNewPwd = utils::ReadPostedParam('new_pwd', '', 'raw_data');
-				if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
+
+				try
+				{
+					if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
+					{
+						$oPage = self::NewLoginWebPage();
+						$oPage->DisplayChangePwdForm(true); // old pwd was wrong
+						$oPage->output();
+						exit;
+					}
+				}
+				catch (CoreCannotSaveObjectException $e)
 				{
 					$oPage = self::NewLoginWebPage();
-					$oPage->DisplayChangePwdForm(true); // old pwd was wrong
+					$oPage->DisplayChangePwdForm(true, $e->getIssue()); // password policy was not met.
 					$oPage->output();
 					exit;
 				}

application/maintenancemsg.php

@@ -1,7 +1,20 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2019 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * 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
  */
 
 
@@ -18,12 +31,18 @@
 function _MaintenanceSetupPageMessage($sTitle, $sMessage)
 {
 	// Web Page
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT.'setup/setuppage.class.inc.php');
 	if (class_exists('SetupPage'))
 	{
 		$oP = new SetupPage($sTitle);
-		$oP->p("<h2>$sMessage</h2>");
+		$oP->p("<h2 class=\"center\">$sMessage</h2>");
+		$oP->add_ready_script(
+<<<JS
+// Reload in 30s to check if maintenance is over
+setTimeout(function(){ window.location.reload(); }, 30000);
+JS
+
+		);
 		$oP->output();
 	}
 	else
@@ -58,7 +77,6 @@ function _MaintenanceHtmlMessage($sMessage)
  */
 function _MaintenanceJsonMessage($sTitle, $sMessage)
 {
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
 	if (class_exists('ajax_page'))
 	{

application/menunode.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * Construction and display of the application's main menu
+ * Copyright (C) 2013-2019 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -201,7 +194,7 @@ class ApplicationMenu
 
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param $aExtraParams
 	 * @throws DictExceptionMissingString
 	 */
@@ -217,7 +210,7 @@ class ApplicationMenu
 		{
 			if (!self::CanDisplayMenu($aMenu)) { continue; }
 			$oMenuNode = self::GetMenuNode($aMenu['index']);
-			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'">'.$oMenuNode->GetTitle().'</h3>');
+			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'" class="navigation-menu-group" data-menu-id="'.$oMenuNode->GetMenuId().'">'.$oMenuNode->GetTitle().'</h3>');
 			$oPage->AddToMenu('<div>');
 			$oPage->AddToMenu('<ul>');
 			$aChildren = self::GetChildren($aMenu['index']);
@@ -270,7 +263,7 @@ EOF
 
 	/**
 	 * Handles the display of the sub-menus (called recursively if necessary)
-	 * @param \iTopWebPage $oPage
+	 * @param \WebPage $oPage
 	 * @param array $aMenus
 	 * @param array $aExtraParams
 	 * @param int $iActiveMenu
@@ -284,14 +277,22 @@ EOF
 		usort($aMenus, array('ApplicationMenu', 'CompareOnRank'));
 		foreach($aMenus as $aMenu)
 		{
+			if (!self::CanDisplayMenu($aMenu))
+			{
+				continue;
+			}
 			$index = $aMenu['index'];
 			$oMenu = self::GetMenuNode($index);
 			if ($oMenu->IsEnabled())
 			{
 				$aChildren = self::GetChildren($index);
-				$sCSSClass = (count($aChildren) > 0) ? ' class="submenu"' : '';
+				$aCSSClasses = array('navigation-menu-item');
+				if (count($aChildren) > 0)
+				{
+					$aCSSClasses[] = 'submenu';
+				}
 				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
-				$sItemHtml = '<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'>';
+				$sItemHtml = '<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" class="'.implode(' ', $aCSSClasses).'" data-menu-id="'.$oMenu->GetMenuID().'">';
 				if ($sHyperlink != '')
 				{
 					$sLinkTarget = '';
@@ -299,7 +300,9 @@ EOF
 					{
 						$sLinkTarget .= ' target="_blank"';
 					}
-					$sItemHtml .= '<a href="'.$oMenu->GetHyperlink($aExtraParams).'"'.$sLinkTarget.'>'.$oMenu->GetTitle().'</a>';
+					$sURL = '"'.$oMenu->GetHyperlink($aExtraParams).'"'.$sLinkTarget;
+					$sTitle = $oMenu->GetTitle();
+					$sItemHtml .= "<a href={$sURL}>{$sTitle}</a>";
 				}
 				else
 				{
@@ -607,7 +610,9 @@ abstract class MenuNode
 
 	/**
 	 * @param $aExtraParams
+	 *
 	 * @return string
+	 * @throws \Exception
 	 */
 	public function GetHyperlink($aExtraParams)
 	{
@@ -983,7 +988,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/search.png');
+		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png');
 
 		$oSearch = new DBObjectSearch($this->sClass);
 		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);

application/nicewebpage.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * Class NiceWebPage
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT."/application/webpage.class.inc.php");
@@ -46,8 +39,7 @@ class NiceWebPage extends WebPage
 		{
 			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.prod.min.js');
 		}
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/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
@@ -124,7 +116,7 @@ class NiceWebPage extends WebPage
 	$("table.listResults").tableHover(); // hover tables
 EOF
 		);
-		$this->add_saas("css/light-grey.scss");
+	    $this->LoadTheme();
 
 		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
      	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
@@ -257,6 +249,14 @@ EOF
 		}
 		parent::output();
 	}
-}
 
-?>
+	/**
+	 * @throws \Exception
+	 * @since 2.7.0
+	 */
+	protected function LoadTheme()
+	{
+		$sCssThemeUrl = ThemeHandler::GetDefaultThemeUrl();
+		$this->add_linked_stylesheet($sCssThemeUrl);
+	}
+}

application/template.class.inc.php

@@ -1,27 +1,20 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * Class DisplayTemplate
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
  */
 
 require_once(APPROOT.'/application/displayblock.class.inc.php');
@@ -191,7 +184,7 @@ class DisplayTemplate
 			break;
 			
 			case 'itoptab':
-				$oPage->SetCurrentTab(Dict::S(str_replace('_', ' ', $aAttributes['name'])));
+				$oPage->SetCurrentTab($aAttributes['name'], str_replace('_', ' ', $aAttributes['name']));
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
 				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');

application/themehandler.class.inc.php

@@ -0,0 +1,117 @@
+<?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
+ */
+
+use ScssPhp\ScssPhp\Compiler;
+
+/**
+ * Class ThemeHandler
+ *
+ * @author Stephen Abello <stephen.abello@combodo.com>
+ * @since 2.7.0
+ */
+class ThemeHandler
+{
+	/**
+	 * Return the absolute URL for the default theme CSS file
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function GetDefaultThemeUrl()
+	{
+		$sThemeId = MetaModel::GetConfig()->Get('backoffice_default_theme');
+		static::CompileTheme($sThemeId);
+
+		// Return absolute url to theme compiled css
+		return utils::GetAbsoluteUrlModulesRoot().'/branding/themes/'.$sThemeId.'/main.css';
+	}
+
+	/**
+	 * Compile the $sThemeId theme
+	 *
+	 * @param string $sThemeId
+	 * @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
+	 */
+	public static function CompileTheme($sThemeId, $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null)
+	{
+		// Default working path
+		if($sWorkingPath === null)
+		{
+			$sWorkingPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
+		}
+
+		// Default import paths (env-*)
+		if($aImportsPaths === null)
+		{
+			$aImportsPaths = array(
+				APPROOT.'env-'.utils::GetCurrentEnvironment().'/',
+			);
+		}
+
+		// Note: We do NOT check that the folder exists!
+		$sThemeFolderPath = $sWorkingPath.'/branding/themes/'.$sThemeId.'/';
+		$sThemeCssPath = $sThemeFolderPath.'main.css';
+
+		// Save parameters if passed...
+		if(is_array($aThemeParameters))
+		{
+			file_put_contents($sThemeFolderPath.'/theme-parameters.json', json_encode($aThemeParameters));
+		}
+		// ... Otherwise, retrieve them from compiled DM
+		else
+		{
+			$aThemeParameters = json_decode(@file_get_contents($sThemeFolderPath.'theme-parameters.json'), true);
+			if ($aThemeParameters === null)
+			{
+				throw new CoreException('Could not load "'.$sThemeId.'" theme parameters from file, check that it has been compiled correctly');
+			}
+		}
+
+		$sTmpThemeScssContent = '';
+		$iStyleLastModified = 0;
+		clearstatcache();
+		// Loading files to import and stylesheet to compile, also getting most recent modification time on overall files
+		foreach ($aThemeParameters['imports'] as $sImport)
+		{
+			$sTmpThemeScssContent .= '@import "'.$sImport.'";'."\n";
+
+			$iImportLastModified = @filemtime($sWorkingPath.$sImport);
+			$iStyleLastModified = $iStyleLastModified < $iImportLastModified ? $iImportLastModified : $iStyleLastModified;
+		}
+		foreach ($aThemeParameters['stylesheets'] as $sStylesheet)
+		{
+			$sTmpThemeScssContent .= '@import "'.$sStylesheet.'";'."\n";
+
+			$iStylesheetLastModified = @filemtime($sWorkingPath.$sStylesheet);
+			$iStyleLastModified = $iStyleLastModified < $iStylesheetLastModified ? $iStylesheetLastModified : $iStyleLastModified;
+		}
+
+		// Checking if our compiled css is outdated
+		if (!file_exists($sThemeCssPath) || (is_writable($sThemeFolderPath) && (@filemtime($sThemeCssPath) < $iStyleLastModified)))
+		{
+			$sTmpThemeCssContent = utils::CompileCSSFromSASS($sTmpThemeScssContent, $aImportsPaths, $aThemeParameters['variables']);
+			file_put_contents($sThemeCssPath, $sTmpThemeCssContent);
+		}
+	}
+}
+

application/twigextension.class.inc.php

@@ -122,5 +122,19 @@ class TwigExtension
 			$oConfig = MetaModel::GetConfig();
 			return $oConfig->Get($sParamName);
 		}));
+
+		// Function to get the URL of a static page in a module
+		// Usage in twig: {{ get_static_page_module_url('itop-my-module', 'path-to-my-page') }}
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_static_page_module_url', function($sModuleName, $sPage)
+		{
+			return utils::GetAbsoluteUrlModulesRoot().$sModuleName.'/'.$sPage;
+		}));
+
+		// Function to get the URL of a php page in a module
+		// Usage in twig: {{ get_page_module_url('itop-my-module', 'path-to-my-my-page.php') }}
+		$oTwigEnv->addFunction(new Twig_SimpleFunction('get_page_module_url', function($sModuleName, $sPage)
+		{
+			return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage);
+		}));
 	}
-}
+}

application/ui.extkeywidget.class.inc.php

@@ -1,23 +1,28 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-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
+ */
+
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+
 /**
  * Class UIExtKeyWidget
- * UI wdiget for displaying and editing external keys when
+ * UI widget for displaying and editing external keys when
  * A simple drop-down list is not enough...
  *
  * The layout is the following
@@ -54,13 +59,7 @@
  * | |   +--------+    +-----+                    | |
  * | +--------------------------------------------+ |
  * +------------------------------------------------+
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @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 UIExtKeyWidget
 {
 	const ENUM_OUTPUT_FORMAT_CSV = 'csv';
@@ -274,7 +273,7 @@ EOF
 
 			// the input for the auto-complete
 			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.Search();\"/></span>";
+			$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
 			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
@@ -298,7 +297,7 @@ EOF
 		}
 		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
 		{
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_tree_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_tree.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"/></span>";
+			$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(
 <<<EOF
 			if ($('#ac_tree_{$this->iId}').length == 0)
@@ -312,7 +311,7 @@ EOF
 		{
 			$sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject';
 
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_add_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_add.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"/></span>";
+			$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(
 <<<EOF
 		if ($('#ajax_{$this->iId}').length == 0)
@@ -578,8 +577,21 @@ EOF
 		$oNewObj->UpdateObjectFromArg('default');
 
 		$sDialogTitle = '';
-		$oPage->add('<div id="ac_create_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div id="dcr_'.$this->iId.'">');
-		$oPage->add("<h1>".MetaModel::GetClassIcon($this->sTargetClass)."&nbsp;".Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($this->sTargetClass))."</h1>\n");
+		$sClassLabel = MetaModel::GetName($this->sTargetClass);
+		$sClassIcon = MetaModel::GetClassIcon($this->sTargetClass);
+		$sObjClass = get_class($oNewObj);
+		$sObjKey = $oNewObj->GetKey();
+		$sHeaderTitle = Dict::Format('UI:CreationTitle_Class', $sClassLabel);
+		$oPage->add(<<<HTML
+<div id="ac_create_{$this->iId}">
+	<!-- Beginning of object-details -->
+	<div class="object-details" data-object-class="$sObjClass" data-object-id="$sObjKey" data-object-mode="create">
+		<!-- Beginning of wizContainer -->
+		<div class="wizContainer" style="vertical-align:top;">
+			<div id="dcr_{$this->iId}">
+				<h1>$sClassIcon&nbsp;$sHeaderTitle</h1>
+HTML
+		);
 		$aFieldsFlags = array();
 		$aFieldsComments = array();
 		foreach(MetaModel::ListAttributeDefs($this->sTargetClass) as $sAttCode => $oAttDef)
@@ -591,7 +603,13 @@ EOF
 			}
 		}
 	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));
-		$oPage->add('</div></div></div>');
+		$oPage->add(<<<HTML
+			</div>
+		</div><!-- End of wizContainer -->
+	</div><!-- End of object-details -->
+</div>
+HTML
+		);
 //		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: $(window).width()*0.8, height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
 		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
 		$oPage->add_ready_script("$('#dcr_{$this->iId} form').removeAttr('onsubmit');");

application/ui.linkswidget.class.inc.php

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

application/utils.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Copyright (C) 2013-2020 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -591,9 +591,11 @@ class utils
 	 * Format a value into a more friendly format (KB, MB, GB, TB) instead a juste a Bytes amount.
 	 *
 	 * @param float $value
+	 * @param int $iPrecision
+	 *
 	 * @return string
 	 */
-	public static function BytesToFriendlyFormat($value)
+	public static function BytesToFriendlyFormat($value, $iPrecision = 0)
 	{
 		$sReturn = '';
 		// Kilobytes
@@ -601,6 +603,9 @@ class utils
 		{
 			$sReturn = 'K';
 			$value = $value / 1024;
+			if ($iPrecision === 0) {
+				$iPrecision = 1;
+			}
 		}
 		// Megabytes
 		if ($value >= 1024)
@@ -621,16 +626,18 @@ class utils
 			$value = $value / 1024;
 		}
 
-		$value = round($value, 1);
+		$value = round($value, $iPrecision);
 
 		return $value . '' . $sReturn . 'B';
 	}
 
 	/**
-	 * Helper function to convert a string to a date, given a format specification. It replaces strtotime which does not allow for specifying a date in a french format (for instance)
-	 * Example: StringToTime('01/05/11 12:03:45', '%d/%m/%y %H:%i:%s')
+	 * Helper function to convert a string to a date, given a format specification. It replaces strtotime which does not allow for
+	 * specifying a date in a french format (for instance) Example: StringToTime('01/05/11 12:03:45', '%d/%m/%y %H:%i:%s')
+	 *
 	 * @param string $sDate
 	 * @param string $sFormat
+	 *
 	 * @return string|false false if the input format is not correct, timestamp otherwise
 	 */
 	public static function StringToTime($sDate, $sFormat)
@@ -790,13 +797,14 @@ class utils
 		return $sUrl;
 	}
 
-    /**
-     * Builds an root url from the server's variables.
-     * 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.
-     *
-     * @return string
-     *
-     * @throws \Exception
+	/**
+	 * Builds an root url from the server's variables.
+	 * 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.
+	 *
+	 * @return string
+	 *
+	 * @throws \Exception
      */
     public static function GetDefaultUrlAppRoot()
 	{
@@ -838,10 +846,25 @@ class utils
 		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
 
 		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
+		$sAppRoot       = realpath(APPROOT);
+
+		return self::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl);
+	}
+
+	/**
+	 * @param $sCurrentScript
+	 * @param $sAppRoot
+	 * @param $sAbsoluteUrl
+	 *
+	 * @return false|string
+	 * @throws \Exception
+	 */
+	public static function GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl)
+	{
 		$sCurrentScript = str_replace('\\', '/', $sCurrentScript); // canonical path
-		$sAppRoot = str_replace('\\', '/', APPROOT); // canonical path
-		$sCurrentRelativePath = str_replace($sAppRoot, '', $sCurrentScript);
-	
+		$sAppRoot = str_replace('\\', '/', $sAppRoot).'/'; // canonical path with the trailing '/' appended
+		$sCurrentRelativePath = str_ireplace($sAppRoot, '', $sCurrentScript);
+
 		$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
 		if ($sAppRootPos !== false)
 		{
@@ -850,7 +873,7 @@ class utils
 		else
 		{
 			// Second attempt without index.php at the end...
-			$sCurrentRelativePath = str_replace('index.php', '', $sCurrentRelativePath);
+			$sCurrentRelativePath = str_ireplace('index.php', '', $sCurrentRelativePath);
 			$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
 			if ($sAppRootPos !== false)
 			{
@@ -860,8 +883,9 @@ class utils
 			{
 				// No luck...
 				throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath) APPROOT:'$sAppRoot'");
-			}			
+			}
 		}
+
 		return $sAppRootUrl;
 	}
 
@@ -1144,16 +1168,17 @@ class utils
 				break;
 
 			default:
-			// Unknown type of menu, do nothing
-			$aResult = array();
+				// Unknown type of menu, do nothing
+				$aResult = array();
 		}
-		foreach($aResult as $oMenuItem)
+		foreach ($aResult as $oMenuItem)
 		{
 			$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
 		}
 
 		// Invoke the plugins
 		//
+		/** @var \iPopupMenuExtension $oExtensionInstance */
 		foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
 		{
 			if (is_object($param) && !($param instanceof DBObject))
@@ -1541,18 +1566,40 @@ class utils
 		clearstatcache();
 		if (!file_exists($sCssPath) || (is_writable($sCssPath) && (filemtime($sCssPath) < filemtime($sSassPath))))
 		{
-			$oScss = new Compiler();
-			$oScss->setImportPaths($aImportPaths);
-			$oScss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Expanded');
-			// Temporary disabling max exec time while compiling
-			$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
-			set_time_limit(0);
-			$sCss = $oScss->compile(file_get_contents($sSassPath));
-			set_time_limit($iCurrentMaxExecTime);
+			$sCss = static::CompileCSSFromSASS(file_get_contents($sSassPath), $aImportPaths);
 			file_put_contents($sCssPath, $sCss);
 		}
 		return $sCssRelPath;
 	}
+
+	/**
+	 * Return a string of CSS compiled from the $sSassContent
+	 *
+	 * @param string $sSassContent
+	 * @param array $aImportPaths
+	 * @param array $aVariables
+	 *
+	 * @return string
+	 *
+	 * @since 2.7.0
+	 */
+	public static function CompileCSSFromSASS($sSassContent, $aImportPaths = array(), $aVariables = array())
+	{
+		$oSass = new Compiler();
+		$oSass->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Expanded');
+		// Setting our variables
+		$oSass->setVariables($aVariables);
+		// Setting our imports paths
+		$oSass->setImportPaths($aImportPaths);
+		// Temporary disabling max exec time while compiling
+		$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
+		set_time_limit(0);
+		// Compiling SASS
+		$sCss = $oSass->compile($sSassContent);
+		set_time_limit($iCurrentMaxExecTime);
+
+		return $sCss;
+	}
 	
 	public static function GetImageSize($sImageData)
 	{
@@ -1890,17 +1937,17 @@ class utils
 				'doc' => 'application/msword',
 				'dot' => 'application/msword',
 				'xls' => 'application/vnd.ms-excel',
-				'ppt' => 'application/vnd.ms-powerpoint',
-				'vsd' => 'application/x-visio',
-				'vdx' => 'application/visio.drawing',
-				'odt' => 'application/vnd.oasis.opendocument.text',
-				'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-				'odp' => 'application/vnd.oasis.opendocument.presentation',
-				'zip' => 'application/zip',
-				'txt' => 'text/plain',
-				'htm' => 'text/html',
-				'html' => 'text/html',
-				'exe' => 'application/octet-stream'
+			'ppt' => 'application/vnd.ms-powerpoint',
+			'vsd' => 'application/x-visio',
+			'vdx' => 'application/visio.drawing',
+			'odt' => 'application/vnd.oasis.opendocument.text',
+			'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+			'odp' => 'application/vnd.oasis.opendocument.presentation',
+			'zip' => 'application/zip',
+			'txt' => 'text/plain',
+			'htm' => 'text/html',
+			'html' => 'text/html',
+			'exe' => 'application/octet-stream',
 		);
 	
 		$sData = null;
@@ -2084,6 +2131,11 @@ class utils
 	 */
 	final public static function StartsWith($haystack, $needle)
 	{
+		if (strlen($needle) > strlen($haystack))
+		{
+			return false;
+		}
+
 		return substr_compare($haystack, $needle, 0, strlen($needle)) === 0;
 	}
 
@@ -2095,6 +2147,11 @@ class utils
 	 * @return bool
 	 */
 	final public static function EndsWith($haystack, $needle) {
+		if (strlen($needle) > strlen($haystack))
+		{
+			return false;
+		}
+		
 		return substr_compare($haystack, $needle, -strlen($needle)) === 0;
 	}
 
@@ -2131,14 +2188,14 @@ class utils
 	 * Returns the local path relative to the iTop installation of an existing file
 	 * Dir separator is changed to '/' for consistency among the different OS
 	 *
-	 * @param string $sPath absolute path
+	 * @param string $sAbsolutePath absolute path
 	 *
 	 * @return false|string
 	 */
-	final public static function LocalPath($sPath)
+	final public static function LocalPath($sAbsolutePath)
 	{
 		$sRootPath = realpath(APPROOT);
-		$sFullPath = realpath($sPath);
+		$sFullPath = realpath($sAbsolutePath);
 		if (($sFullPath === false) || !self::StartsWith($sFullPath, $sRootPath))
 		{
 			return false;
@@ -2165,4 +2222,32 @@ class utils
 		}
 		return $sFullPath;
 	}
+
+	public static function GetAbsoluteModulePath($sModule)
+	{
+		return APPROOT.'env-'.utils::GetCurrentEnvironment().'/'.$sModule.'/';
+	}
+
+	public static function GetCurrentUserName()
+	{
+		if (function_exists('posix_getpwuid'))
+		{
+			return posix_getpwuid(posix_geteuid())['name'];
+		}
+
+		return getenv('username');
+	}
+
+	/**
+	 * Transform a snake_case $sInput into a CamelCase string
+	 *
+	 * @since 2.7.0
+	 * @param string $sInput
+	 *
+	 * @return string
+	 */
+	public static function ToCamelCase($sInput)
+	{
+		return str_replace(' ', '', ucwords(strtr($sInput, '_-', '  ')));
+	}
 }

application/wizardhelper.class.inc.php

@@ -273,10 +273,6 @@ class WizardHelper
 	static public function FromJSON($sJSON)
 	{
 		$oWizHelper = new WizardHelper();
-		if (get_magic_quotes_gpc())
-		{
-			$sJSON = stripslashes($sJSON);
-		}
 		$aData = json_decode($sJSON, true); // true means hash array instead of object
 		$oWizHelper->m_aData = $aData;
 		return $oWizHelper;

application/xlsxwriter.class.php

@@ -174,7 +174,7 @@ Class XLSXWriter
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
 		} else if ($value==''){
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'"/>');
-		} else if ($value{0}=='='){
+		} else if ($value[0]=='='){
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
 		} else if ($value!==''){
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><v>'.self::xmlspecialchars($this->setSharedString($value)).'</v></c>');

approot.inc.php

@@ -2,67 +2,5 @@
 
 define('APPROOT', dirname(__FILE__).'/');
 define('APPCONF', APPROOT.'conf/');
-define('ITOP_DEFAULT_ENV', 'production');
-define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 
-if (function_exists('microtime'))
-{
-	$fItopStarted = microtime(true); 
-}
-else
-{
-	$fItopStarted = 1000 * time();
-}
-
-//
-// Maintenance mode
-//
-
-// Use 'maintenance' parameter to bypass maintenance mode
-if (!isset($bBypassMaintenance))
-{
-	$bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false;
-}
-
-if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
-{
-	$sMessage = 'This application is currently under maintenance.';
-	$sTitle = 'Maintenance';
-
-	http_response_code(503);
-	// Display message depending on the request
-	include(APPROOT.'application/maintenancemsg.php');
-
-	switch (true)
-	{
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/pages/ajax.searchform.php'):
-			_MaintenanceHtmlMessage($sMessage);
-			break;
-
-		case array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER):
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/webservices/soapserver.php'):
-		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/webservices/rest.php'):
-			_MaintenanceTextMessage($sMessage);
-			break;
-
-		case isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] == 'application/json'):
-			_MaintenanceJsonMessage($sTitle, $sMessage);
-			break;
-
-		default:
-			_MaintenanceSetupPageMessage($sTitle, $sMessage);
-			break;
-	}
-	exit();
-}
-
-/**
- * helper to test if a string ends with another
- * @param $haystack
- * @param $needle
- *
- * @return bool
- */
-function EndsWith($haystack, $needle) {
-	return substr_compare($haystack, $needle, -strlen($needle)) === 0;
-}
+require_once APPROOT.'bootstrap.inc.php';

bootstrap.inc.php

@@ -18,7 +18,76 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-require_once __DIR__.'/approot.inc.php';
-require_once APPROOT.'/lib/autoload.php';
+define('ITOP_DEFAULT_ENV', 'production');
+define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
+define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
-// Require here files containing PHP instructions
+if (function_exists('microtime'))
+{
+	$fItopStarted = microtime(true);
+}
+else
+{
+	$fItopStarted = 1000 * time();
+}
+
+if (! isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false)
+{
+	require_once APPROOT.'/lib/autoload.php';
+}
+
+//
+// Maintenance mode
+//
+
+// Use 'maintenance' parameter to bypass maintenance mode
+if (!isset($bBypassMaintenance))
+{
+	$bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false;
+}
+
+if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
+{
+	$sTitle = 'Maintenance';
+	$sMessage = 'This application is currently under maintenance.';
+
+	http_response_code(503);
+	// Display message depending on the request
+	include(APPROOT.'application/maintenancemsg.php');
+	$sSAPIName = strtoupper(trim(php_sapi_name()));
+
+	switch (true)
+	{
+		case isset($_SERVER['REQUEST_URI']) && EndsWith($_SERVER['REQUEST_URI'], '/pages/ajax.searchform.php'):
+			_MaintenanceHtmlMessage($sMessage);
+			break;
+
+		case $sSAPIName == 'CLI':
+		case array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER):
+		case isset($_SERVER['REQUEST_URI']) && (strpos($_SERVER['REQUEST_URI'], '/webservices/soapserver.php') !== false):
+		case isset($_SERVER['REQUEST_URI']) && (strpos($_SERVER['REQUEST_URI'], '/webservices/export-v2.php') !== false):
+			_MaintenanceTextMessage($sMessage);
+			break;
+
+		case isset($_SERVER['REQUEST_URI']) && (strpos($_SERVER['REQUEST_URI'], '/webservices/rest.php') !== false):
+		case isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] == 'application/json'):
+			_MaintenanceJsonMessage($sTitle, $sMessage);
+			break;
+
+		default:
+			_MaintenanceSetupPageMessage($sTitle, $sMessage);
+			break;
+	}
+	exit();
+}
+
+/**
+ * helper to test if a string ends with another
+ * @param $haystack
+ * @param $needle
+ *
+ * @return bool
+ */
+function EndsWith($haystack, $needle) {
+	return substr_compare($haystack, $needle, -strlen($needle)) === 0;
+}

composer.json

@@ -3,26 +3,25 @@
   "license": "AGPLv3",
   "require": {
     "php": ">=5.6.0",
-    "ext-soap": "*",
+    "ext-ctype": "*",
+    "ext-dom": "*",
+    "ext-gd": "*",
+    "ext-iconv": "*",
     "ext-json": "*",
     "ext-mysqli": "*",
-    "ext-dom": "*",
-    "ext-iconv": "*",
-    "ext-gd": "*",
-    "ext-ctype": "*",
-
-    "scssphp/scssphp": "1.0.0",
-    "swiftmailer/swiftmailer": "5.4.9",
+    "ext-soap": "*",
+    "combodo/tcpdf": "6.3.2",
+    "nikic/php-parser": "^3.1",
+    "pear/archive_tar": "1.4.9",
     "pelago/emogrifier": "2.1.0",
-    "combodo/tcpdf": "6.3.0",
-    "pear/archive_tar": "1.4.7",
-
+    "scssphp/scssphp": "1.0.6",
+    "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.*",
-    "symfony/polyfill-php70": "1.*"
+    "symfony/yaml": "3.4.*"
   },
   "require-dev": {
     "symfony/stopwatch": "3.4.*",
@@ -44,12 +43,14 @@
     "preferred-install": {
       "*": "dist"
     },
-    "sort-packages": true
+    "sort-packages": true,
+    "classmap-authoritative": true
   },
   "autoload": {
     "classmap": [
       "core",
-      "application"
+      "application",
+      "sources/application"
     ],
     "exclude-from-classmap": [
       "core/dbobjectsearch.class.php",
@@ -74,4 +75,4 @@
       "require": "3.4.*"
     }
   }
-}
+}

composer.readme

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

core/MyHelpers.class.inc.php

@@ -457,7 +457,7 @@ class Str
 	public static function gpc2pure($gpc)
 	{
 		if (ini_get('magic_quotes_sybase')) $pure = str_replace("''", "'", $gpc);
-		else                                $pure = get_magic_quotes_gpc() ? stripslashes($gpc) : $gpc;
+		else                                $pure = $gpc;
 		return $pure;
 	}
 	public static function html2pure($html)

core/autoload.php

@@ -33,6 +33,7 @@ MetaModel::IncludeModule('core/tagsetfield.class.inc.php');
 MetaModel::IncludeModule('synchro/synchrodatasource.class.inc.php');
 MetaModel::IncludeModule('core/backgroundtask.class.inc.php');
 MetaModel::IncludeModule('core/inlineimage.class.inc.php');
+MetaModel::IncludeModule('core/counter.class.inc.php');
 
 MetaModel::IncludeModule('webservices/webservices.basic.php');
 

core/backgroundprocess.inc.php

@@ -56,8 +56,9 @@ interface iBackgroundProcess extends iProcess
  * interface iScheduledProcess
  * A variant of process that must be called at specific times
  *
- * @copyright   Copyright (C) 2013 Combodo SARL
+ * @see \AbstractWeeklyScheduledProcess for a bootstrap implementation
  * @license     http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2013 Combodo SARL
  */
 interface iScheduledProcess extends iProcess
 {
@@ -67,14 +68,189 @@ interface iScheduledProcess extends iProcess
 	public function GetNextOccurrence();
 }
 
+
 /**
- * Class ProcessException
- * Exception for iProcess implementations.<br>
+ * Implementation of {@link iScheduledProcess}, using config parameters for module
+ *
+ * Use these parameters :
+ *
+ * * enabled
+ * * week_days
+ * * time
+ *
+ * Param names and some of their default values are in constant that can be overriden.
+ *
+ * Other info (module name and time default value) should be provided using a method that needs to be implemented.
+ *
+ * @since 2.7.0
+ */
+abstract class AbstractWeeklyScheduledProcess implements iScheduledProcess
+{
+	// param have default names/values but can be overriden
+	const MODULE_SETTING_ENABLED = 'enabled';
+	const DEFAULT_MODULE_SETTING_ENABLED = true;
+	const MODULE_SETTING_WEEKDAYS = 'week_days';
+	const DEFAULT_MODULE_SETTING_WEEKDAYS = 'monday, tuesday, wednesday, thursday, friday, saturday, sunday';
+	const MODULE_SETTING_TIME = 'time';
+
+	/**
+	 * Module must be declared in each implementation
+	 *
+	 * @return string
+	 */
+	abstract protected function GetModuleName();
+
+	/**
+	 * @return string default value for {@link MODULE_SETTING_TIME} config param.
+	 *         example '23:30'
+	 */
+	abstract protected function GetDefaultModuleSettingTime();
+
+	/**
+	 * Interpret current setting for the week days
+	 *
+	 * @returns int[] (monday = 1)
+	 * @throws ProcessInvalidConfigException
+	 */
+	public function InterpretWeekDays()
+	{
+		static $aWEEKDAYTON = array(
+			'monday' => 1,
+			'tuesday' => 2,
+			'wednesday' => 3,
+			'thursday' => 4,
+			'friday' => 5,
+			'saturday' => 6,
+			'sunday' => 7,
+		);
+		$aDays = array();
+		$sWeekDays = MetaModel::GetConfig()->GetModuleSetting(
+			$this->GetModuleName(),
+			static::MODULE_SETTING_WEEKDAYS,
+			static::DEFAULT_MODULE_SETTING_WEEKDAYS
+		);
+
+		if ($sWeekDays !== '')
+		{
+			$aWeekDaysRaw = explode(',', $sWeekDays);
+			foreach ($aWeekDaysRaw as $sWeekDay)
+			{
+				$sWeekDay = strtolower(trim($sWeekDay));
+				if (array_key_exists($sWeekDay, $aWEEKDAYTON))
+				{
+					$aDays[] = $aWEEKDAYTON[$sWeekDay];
+				}
+				else
+				{
+					throw new ProcessInvalidConfigException($this->GetModuleName().": wrong format for setting '".static::MODULE_SETTING_WEEKDAYS."' (found '$sWeekDay')");
+				}
+			}
+		}
+		if (count($aDays) === 0)
+		{
+			throw new ProcessInvalidConfigException($this->GetModuleName().': missing setting \''.static::MODULE_SETTING_WEEKDAYS.'\'');
+		}
+		$aDays = array_unique($aDays);
+		sort($aDays);
+
+		return $aDays;
+	}
+
+	/**
+	 * Gives the exact time at which the process must be run next time
+	 *
+	 * @return DateTime
+	 * @throws Exception
+	 */
+	public function GetNextOccurrence()
+	{
+		$bEnabled = MetaModel::GetConfig()->GetModuleSetting(
+			$this->GetModuleName(),
+			static::MODULE_SETTING_ENABLED,
+			static::DEFAULT_MODULE_SETTING_ENABLED
+		);
+		if (!$bEnabled)
+		{
+			return new DateTime('3000-01-01');
+		}
+
+		// 1st - Interpret the list of days as ordered numbers (monday = 1)
+		//
+		$aDays = $this->InterpretWeekDays();
+
+		// 2nd - Find the next active week day
+		//
+		$sProcessTime = MetaModel::GetConfig()->GetModuleSetting(
+			$this->GetModuleName(),
+			static::MODULE_SETTING_TIME,
+			static::GetDefaultModuleSettingTime()
+		);
+		if (!preg_match('/[0-2]\d:[0-5]\d/', $sProcessTime))
+		{
+			throw new ProcessInvalidConfigException($this->GetModuleName().": wrong format for setting '".static::MODULE_SETTING_TIME."' (found '$sProcessTime')");
+		}
+		$oNow = new DateTime();
+		$iNextPos = false;
+		for ($iDay = $oNow->format('N'); $iDay <= 7; $iDay++)
+		{
+			$iNextPos = array_search($iDay, $aDays, true);
+			if ($iNextPos !== false)
+			{
+				if (($iDay > $oNow->format('N')) || ($oNow->format('H:i') < $sProcessTime))
+				{
+					break;
+				}
+				$iNextPos = false; // necessary on sundays
+			}
+		}
+
+		// 3rd - Compute the result
+		//
+		if ($iNextPos === false)
+		{
+			// Jump to the first day within the next week
+			$iFirstDayOfWeek = $aDays[0];
+			$iDayMove = $oNow->format('N') - $iFirstDayOfWeek;
+			$oRet = clone $oNow;
+			$oRet->modify('-'.$iDayMove.' days');
+			$oRet->modify('+1 weeks');
+		}
+		else
+		{
+			$iNextDayOfWeek = $aDays[$iNextPos];
+			$iMove = $iNextDayOfWeek - $oNow->format('N');
+			$oRet = clone $oNow;
+			$oRet->modify('+'.$iMove.' days');
+		}
+		list($sHours, $sMinutes) = explode(':', $sProcessTime);
+		$oRet->setTime((int)$sHours, (int)$sMinutes);
+
+		return $oRet;
+	}
+
+	/**
+	 * @see \iProcess
+	 *
+	 * @param int $iUnixTimeLimit
+	 *
+	 * @return string
+	 */
+	abstract public function Process($iUnixTimeLimit);
+}
+
+/**
+ * Exception for {@link iProcess} implementations.<br>
  * An error happened during the processing but we can go on with the next implementations.
  */
 class ProcessException extends CoreException
 {
+}
 
+/**
+ * @since 2.7.0
+ */
+class ProcessInvalidConfigException extends ProcessException
+{
 }
 
 /**
@@ -84,5 +260,4 @@ class ProcessException extends CoreException
  */
 class ProcessFatalException extends CoreException
 {
-
 }

core/bulkchange.class.inc.php

@@ -654,7 +654,7 @@ class BulkChange
 		return $aResults;
 	}
 
-	
+
 	protected function CreateObject(&$aResult, $iRow, $aRowData, CMDBChange $oChange = null)
 	{
 		$oTargetObj = MetaModel::NewObject($this->m_sClass);
@@ -726,25 +726,38 @@ class BulkChange
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-MissingExtKey', $sMissingKeys));
 			return $oTargetObj;
 		}
-	
-		// Optionaly record the results
+
+		// Optionally record the results
 		//
 		if ($oChange)
 		{
-			$newID = $oTargetObj->DBInsertTrackedNoReload($oChange);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void($newID);
+			$newID = $oTargetObj->DBInsert();
 		}
 		else
 		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void(0);
+			$newID = 0;
 		}
+
+		$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
+		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
+		$aResult[$iRow]["id"] = new CellStatus_Void($newID);
+
 		return $oTargetObj;
 	}
-	
+
+	/**
+	 * @param array $aResult
+	 * @param int $iRow
+	 * @param \CMDBObject $oTargetObj
+	 * @param array $aRowData
+	 * @param \CMDBChange $oChange
+	 *
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
 	{
 		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
@@ -772,7 +785,7 @@ class BulkChange
 			{
 				try
 				{
-					$oTargetObj->DBUpdateTracked($oChange);
+					$oTargetObj->DBUpdate();
 				}
 				catch(CoreException $e)
 				{
@@ -786,6 +799,14 @@ class BulkChange
 		}
 	}
 
+	/**
+	 * @param array $aResult
+	 * @param int $iRow
+	 * @param \CMDBObject $oTargetObj
+	 * @param \CMDBChange $oChange
+	 *
+	 * @throws \BulkChangeException
+	 */
 	protected function UpdateMissingObject(&$aResult, $iRow, $oTargetObj, CMDBChange $oChange = null)
 	{
 		$aResult[$iRow] = $this->PrepareMissingObject($oTargetObj, $aErrors);
@@ -813,7 +834,7 @@ class BulkChange
 			{
 				try
 				{
-					$oTargetObj->DBUpdateTracked($oChange);
+					$oTargetObj->DBUpdate();
 				}
 				catch(CoreException $e)
 				{
@@ -829,6 +850,11 @@ class BulkChange
 	
 	public function Process(CMDBChange $oChange = null)
 	{
+		if ($oChange)
+		{
+			CMDBObject::SetCurrentChange($oChange);
+		}
+
 		// Note: $oChange can be null, in which case the aim is to check what would be done
 
 		// Debug...

core/bulkexport.class.inc.php

@@ -1,20 +1,21 @@
 <?php
-// Copyright (C) 2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-2019 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
 
 define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 
@@ -109,7 +110,7 @@ class BulkExportResultGC implements iBackgroundProcess
 		{
 			// Next one ?
 			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
-			$oSet->OptimizeColumnLoad(array('temp_file_path'));
+			$oSet->OptimizeColumnLoad(array('BulkExportResult' => array('temp_file_path')));
 			$oResult = $oSet->Fetch();
 			if (is_null($oResult))
 			{
@@ -170,6 +171,7 @@ abstract class BulkExport
 			$oRefClass = new ReflectionClass($sPHPClass);
 			if ($oRefClass->isSubclassOf('BulkExport') && !$oRefClass->isAbstract())
 			{
+				/** @var BulkExport $oBulkExporter */
 				$oBulkExporter = new $sPHPClass();
 				if ($oBulkExporter->IsFormatSupported($sFormatCode, $oSearch))
 				{
@@ -189,7 +191,7 @@ abstract class BulkExport
      *
      * @param int $iPersistentToken The identifier of the BulkExportResult object storing the information
      *
-     * @return iBulkExport|null
+     * @return BulkExport|null
      * @throws ArchivedObjectException
      * @throws CoreException
      * @throws ReflectionException

core/cmdbobject.class.inc.php

@@ -513,7 +513,23 @@ 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);
@@ -521,7 +537,24 @@ abstract class CMDBObject extends DBObject
 		$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);
@@ -529,13 +562,20 @@ abstract class CMDBObject extends DBObject
 		$ret = $this->DBInsertTracked_Internal(true);
 		return $ret;
 	}
-	
+
 	/**
-	 * To Be Obsoleted: DO NOT rely on an overload of this method since
-	 * DBInsertTracked (resp. DBInsertTrackedNoReload) may call directly
-	 * DBInsert (resp. DBInsertNoReload) in future versions of iTop.
+	 * @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)
 	{
@@ -582,6 +622,18 @@ 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);
@@ -593,13 +645,38 @@ abstract class CMDBObject extends DBObject
 	 * @param null $oDeletionPlan
 	 *
 	 * @return \DeletionPlan|null
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
 	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		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);
@@ -611,11 +688,17 @@ abstract class CMDBObject extends DBObject
 	 * @param null $oDeletionPlan
 	 *
 	 * @return \DeletionPlan|null
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
 	 * @throws \DeleteException
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
-		$prevkey = $this->GetKey();
 		$ret = parent::DBDelete($oDeletionPlan);
 		return $ret;
 	}

core/cmdbsource.class.inc.php

@@ -576,11 +576,6 @@ class CMDBSource
 			return $aRes;
 		}
 
-		// Stripslashes
-		if (get_magic_quotes_gpc())
-		{
-			$value = stripslashes($value);
-		}
 		// Quote if not a number or a numeric string
 		if ($bAlways || is_string($value))
 		{
@@ -589,6 +584,24 @@ class CMDBSource
 		return $value;
 	}
 
+	/**
+	 * MariaDB returns "'value'" for enum, while MySQL returns "value" (without the surrounding single quotes)
+	 *
+	 * @param string $sValue
+	 *
+	 * @return string without the surrounding quotes
+	 * @since 2.7.0 N°2490
+	 */
+	private static function RemoveSurroundingQuotes($sValue)
+	{
+		if (utils::StartsWith($sValue, '\'') && utils::EndsWith($sValue, '\''))
+		{
+			$sValue = substr($sValue, 1, -1);
+		}
+
+		return $sValue;
+	}
+
 	/**
 	 * @param string $sSQLQuery
 	 *
@@ -793,6 +806,9 @@ class CMDBSource
 	}
 
 	/**
+	 *
+	 * @deprecated 2.7.0 N°1627 use ItopCounter instead
+	 *
 	 * @param string $sTable
 	 *
 	 * @return int
@@ -1110,6 +1126,83 @@ class CMDBSource
 		return false;
 	}
 
+	/**
+	 * 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 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
+	 *
+	 * @param string $sItopGeneratedFieldType
+	 * @param string $sDbFieldType
+	 *
+	 * @return bool true if same type and options (case sensitive comparison only for type options), false otherwise
+	 * @since 2.7.0 N°2490
+	 */
+	public static function IsSameFieldTypes($sItopGeneratedFieldType, $sDbFieldType)
+	{
+		list($sItopFieldDataType, $sItopFieldTypeOptions, $sItopFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sItopGeneratedFieldType);
+		list($sDbFieldDataType, $sDbFieldTypeOptions, $sDbFieldOtherOptions) = static::GetFieldDataTypeAndOptions($sDbFieldType);
+
+		if (strcasecmp($sItopFieldDataType, $sDbFieldDataType) !== 0)
+		{
+			return false;
+		}
+
+		if (strcmp($sItopFieldTypeOptions, $sDbFieldTypeOptions) !== 0)
+		{
+			// case sensitive comp as we need to check case for enum possible values for example
+			return false;
+		}
+
+		// remove the default value NULL added by MariadDB
+		$sMariaDbDefaultNull = ' DEFAULT \'NULL\'';
+		if (utils::EndsWith($sDbFieldOtherOptions, $sMariaDbDefaultNull))
+		{
+			$sDbFieldOtherOptions = substr($sDbFieldOtherOptions, 0, -strlen($sMariaDbDefaultNull));
+		}
+		// remove quotes around default values (always present in MariaDB)
+		$sDbFieldOtherOptions = preg_replace_callback(
+			'/( DEFAULT )\'([^\']+)\'/',
+			function ($aMatches) use ($sItopFieldDataType) {
+				// ENUM default values should keep quotes, but all other numeric values don't have quotes
+				if (is_numeric($aMatches[2]) && ($sItopFieldDataType !== 'ENUM'))
+				{
+					return $aMatches[1].$aMatches[2];
+				}
+
+				return $aMatches[0];
+			},
+			$sDbFieldOtherOptions);
+
+		if (strcasecmp($sItopFieldOtherOptions, $sDbFieldOtherOptions) !== 0)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @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'
+	 */
+	private static function GetFieldDataTypeAndOptions($sCompleteFieldType)
+	{
+		preg_match('/^([a-zA-Z]+)(\(([^\)]+)\))?( .+)?$/', $sCompleteFieldType, $aMatches);
+
+		$sDataType = $aMatches[1];
+		$sTypeOptions = isset($aMatches[2]) ? $aMatches[3] : '';
+		$sOtherOptions = isset($aMatches[4]) ? $aMatches[4] : '';
+
+		return array($sDataType, $sTypeOptions, $sOtherOptions);
+	}
+
 	/**
 	 * @param string $sTable
 	 * @param string $sField
@@ -1161,7 +1254,8 @@ class CMDBSource
 		}
 		elseif (is_string($aFieldData["Default"]) == 'string')
 		{
-			$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"]);
+			$sDefaultValue = static::RemoveSurroundingQuotes($aFieldData["Default"]);
+			$sRet .= ' DEFAULT '.self::Quote($sDefaultValue);
 		}
 
 		return $sRet;

core/config.class.inc.php

@@ -25,6 +25,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
 define('ITOP_VERSION', '2.7.0-dev');
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');
+define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);
 
 define('ACCESS_USER_WRITE', 1);
 define('ACCESS_ADMIN_WRITE', 2);
@@ -70,14 +71,14 @@ define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|external|basic');
 define('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
 define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random generated key later (if possible)
 define('DEFAULT_ENCRYPTION_LIB', 'Mcrypt'); // We'll define the best encryption available later
+
 /**
  * Config
  * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
  *
- * @package     iTopORM
- *
  * @see \MetaModel::GetConfig() to get the config, if the metamodel was already loaded
  * @see utils::GetConfig() to load config from the current env, if metamodel is not loaded
+ * @package     iTopORM
  */
 class Config
 {
@@ -99,6 +100,14 @@ class Config
 	 * @since 2.7.0 export_pdf_font param
 	 */
 	protected $m_aSettings = array(
+		'log_level_min' => array(
+			'type' => 'array',
+			'description' => 'Optional min log level per channel',
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 		'app_env_label' => array(
 			'type' => 'string',
 			'description' => 'Label displayed to describe the current application environment, defaults to the environment name (e.g. "production")',
@@ -347,8 +356,8 @@ class Config
 			'type' => 'string',
 			'description' => 'Font used when generating a PDF file',
 			'default' => 'DejaVuSans', // DejaVuSans is a UTF-8 Unicode font, embedded in the TCPPDF lib we're using
-										// Standard PDF fonts like helvetica or times newroman are NOT Unicode
-										// A new DroidSansFallback can be used to improve CJK support (se PR #49)
+			// Standard PDF fonts like helvetica or times newroman are NOT Unicode
+			// A new DroidSansFallback can be used to improve CJK support (se PR #49)
 			'value' => '',
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
@@ -588,7 +597,7 @@ class Config
 				'Asia/Istanbul',
 				'Asia/Singapore',
 				'Africa/Casablanca',
-				'Australia/Sydney'
+				'Australia/Sydney',
 			),
 			'default' => 'Europe/Paris',
 			'value' => 'Europe/Paris',
@@ -831,46 +840,46 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-        'email_validation_pattern' => array(
-            'type' => 'string',
-            'description' => 'Regular expression to validate/detect the format of an eMail address',
-            'default' => "[a-zA-Z0-9._&'-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}",
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => true,
-        ),
-        'email_decoration_class' => array(
-            'type' => 'string',
-            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-envelope" will put a mail icon.',
-            'default' => 'fas fa-envelope',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_validation_pattern' => array(
-            'type' => 'string',
-            'description' => 'Regular expression to validate/detect the format of a phone number',
-            'default' => "[0-9.\-\ \+\(\)]+",
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_url_pattern' => array(
-            'type' => 'string',
-            'description' => 'Format for phone number url, use %1$s as a placeholder for the value. eg. "tel:%1$s" for regular phone applications or "callto:%1$s" for Skype. Default is "tel:%1$s".',
-            'default' => 'tel:%1$s',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_decoration_class' => array(
-            'type' => 'string',
-            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-phone" will put a phone icon.',
-            'default' => 'fas fa-phone',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
+		'email_validation_pattern' => array(
+			'type' => 'string',
+			'description' => 'Regular expression to validate/detect the format of an eMail address',
+			'default' => "[a-zA-Z0-9._&'-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}",
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'email_decoration_class' => array(
+			'type' => 'string',
+			'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-envelope" will put a mail icon.',
+			'default' => 'fas fa-envelope',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'phone_number_validation_pattern' => array(
+			'type' => 'string',
+			'description' => 'Regular expression to validate/detect the format of a phone number',
+			'default' => "[0-9.\-\ \+\(\)]+",
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'phone_number_url_pattern' => array(
+			'type' => 'string',
+			'description' => 'Format for phone number url, use %1$s as a placeholder for the value. eg. "tel:%1$s" for regular phone applications or "callto:%1$s" for Skype. Default is "tel:%1$s".',
+			'default' => 'tel:%1$s',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'phone_number_decoration_class' => array(
+			'type' => 'string',
+			'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-phone" will put a phone icon.',
+			'default' => 'fas fa-phone',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 		'log_kpi_duration' => array(
 			'type' => 'integer',
 			'description' => 'Level of logging for troubleshooting performance issues (1 to enable, 2 +blame callers) new: add "log_kpi_slow_queries" to limit the stats',
@@ -1232,7 +1241,19 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
+		'backoffice_default_theme' => array(
+			'type' => 'string',
+			'description' => 'Default theme used for '.ITOP_APPLICATION_SHORT.'\'s console',
+			'default' => 'light-grey',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 	);
+	/**
+	 * @var \iTopConfigParser|null
+	 */
+	private $oItopConfigParser;
 
 	public function IsProperty($sPropCode)
 	{
@@ -1265,7 +1286,7 @@ class Config
 	 *
 	 * @throws \CoreException
 	 */
-	public function Set($sPropCode, $value, $sSourceDesc = 'unknown')
+	public function Set($sPropCode, $value, $sSourceDesc = 'unknown', $bCanOverride = false)
 	{
 		$sType = $this->m_aSettings[$sPropCode]['type'];
 		switch ($sType)
@@ -1289,17 +1310,18 @@ class Config
 		}
 		$this->m_aSettings[$sPropCode]['value'] = $value;
 		$this->m_aSettings[$sPropCode]['source_of_value'] = $sSourceDesc;
+		$this->m_aCanOverrideSettings[$sPropCode] = $bCanOverride;
 	}
 
-    /**
-     * @param string $sPropCode
-     *
-     * @return mixed
-     */
-    public function Get($sPropCode)
-    {
-        return $this->m_aSettings[$sPropCode]['value'];
-    }
+	/**
+	 * @param string $sPropCode
+	 *
+	 * @return mixed
+	 */
+	public function Get($sPropCode)
+	{
+		return $this->m_aSettings[$sPropCode]['value'];
+	}
 
 	/**
 	 * Event log options (see LOG_... definition)
@@ -1371,16 +1393,16 @@ class Config
 	 */
 	protected $m_aCharsets;
 
-    /**
-     * Config constructor.
-     *
-     * @param string|null $sConfigFile
-     * @param bool $bLoadConfig
-     *
-     * @throws \ConfigException
-     * @throws \CoreException
-     */
-    public function __construct($sConfigFile = null, $bLoadConfig = true)
+	/**
+	 * Config constructor.
+	 *
+	 * @param string|null $sConfigFile
+	 * @param bool $bLoadConfig
+	 *
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 */
+	public function __construct($sConfigFile = null, $bLoadConfig = true)
 	{
 		$this->m_sFile = $sConfigFile;
 		if (is_null($sConfigFile))
@@ -1416,7 +1438,7 @@ class Config
 		//define default encryption params according to php install
 		$aEncryptParams = SimpleCrypt::GetNewDefaultParams();
 		$this->m_sEncryptionLibrary = isset($aEncryptParams['lib']) ? $aEncryptParams['lib'] : DEFAULT_ENCRYPTION_LIB;
-		$this->m_sEncryptionKey= isset($aEncryptParams['key']) ? $aEncryptParams['key'] : DEFAULT_ENCRYPTION_KEY;
+		$this->m_sEncryptionKey = isset($aEncryptParams['key']) ? $aEncryptParams['key'] : DEFAULT_ENCRYPTION_KEY;
 
 		$this->m_aModuleSettings = array();
 
@@ -1442,13 +1464,13 @@ class Config
 		 */
 	}
 
-    /**
-     * @param string $sPurpose
-     * @param string $sFileName
-     *
-     * @throws \ConfigException
-     */
-    protected function CheckFile($sPurpose, $sFileName)
+	/**
+	 * @param string $sPurpose
+	 * @param string $sFileName
+	 *
+	 * @throws \ConfigException
+	 */
+	protected function CheckFile($sPurpose, $sFileName)
 	{
 		if (!file_exists($sFileName))
 		{
@@ -1491,7 +1513,7 @@ class Config
 			$sNoise = trim(ob_get_contents());
 			ob_end_clean();
 		}
-		catch(Error $e)
+		catch (Error $e)
 		{
 			// PHP 7
 			throw new ConfigException('Error in configuration file',
@@ -1542,10 +1564,15 @@ class Config
 				{
 					$value = $rawvalue;
 				}
-				$this->Set($sPropCode, $value, $sConfigFile);
+				$this->Set($sPropCode, $value, $sConfigFile, true);
 			}
 		}
 
+		if (file_exists(READONLY_MODE_FILE))
+		{
+			$this->Set('access_mode', ACCESS_READONLY, READONLY_MODE_FILE);
+		}
+
 		$this->m_bLogGlobal = isset($MySettings['log_global']) ? (bool)trim($MySettings['log_global']) : DEFAULT_LOG_GLOBAL;
 		$this->m_bLogNotification = isset($MySettings['log_notification']) ? (bool)trim($MySettings['log_notification']) : DEFAULT_LOG_NOTIFICATION;
 		$this->m_bLogIssue = isset($MySettings['log_issue']) ? (bool)trim($MySettings['log_issue']) : DEFAULT_LOG_ISSUE;
@@ -1575,12 +1602,14 @@ class Config
 	}
 
 	/**
-	 * @param string $sModule
+	 * @see \MetaModel::GetModuleParameter()
+	 *
 	 * @param string $sProperty
 	 * @param mixed $defaultvalue
 	 *
+	 * @param string $sModule
+	 *
 	 * @return mixed|null if present, value defined in the configuration file, if not module parameter from XML
-	 * @see \MetaModel::GetModuleParameter()
 	 */
 	public function GetModuleSetting($sModule, $sProperty, $defaultvalue = null)
 	{
@@ -1593,16 +1622,18 @@ class Config
 		return $this->GetModuleParameter($sModule, $sProperty, $defaultvalue);
 	}
 
-    /**
-     * @param string $sModule
-     * @param string $sProperty
-     * @param mixed $defaultvalue
-     *
-     * @return mixed|null parameter value defined in the XML
-     * @see \MetaModel::GetModuleSetting() to get from the configuration file first
-     * @link https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Axml_reference#modules_parameters
-     */
-    public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
+	/**
+	 * @see \MetaModel::GetModuleSetting() to get from the configuration file first
+	 *
+	 * @param string $sProperty
+	 * @param mixed $defaultvalue
+	 *
+	 * @param string $sModule
+	 *
+	 * @return mixed|null parameter value defined in the XML
+	 * @link https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Axml_reference#modules_parameters
+	 */
+	public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
 	{
 		$ret = $defaultvalue;
 		if (class_exists('ModulesXMLParameters'))
@@ -1848,22 +1879,46 @@ class Config
 		return $aSettings;
 	}
 
-    /**
-     * Write the configuration to a file (php format) that can be reloaded later
-     * By default write to the same file that was specified when constructing the object
-     *
-     * @param string $sFileName string Name of the file to write to (emtpy to write to the same file)
-     *
-     * @return boolean True otherwise throws an Exception
+	/**
+	 * Write the configuration to a file (php format) that can be reloaded later
+	 * By default write to the same file that was specified when constructing the object
 	 *
-     * @throws \ConfigException
-     */
+	 * @param string $sFileName string Name of the file to write to (emtpy to write to the same file)
+	 *
+	 * @return boolean True otherwise throws an Exception
+	 *
+	 * @throws \ConfigException
+	 */
 	public function WriteToFile($sFileName = '')
 	{
 		if (empty($sFileName))
 		{
 			$sFileName = $this->m_sFile;
 		}
+		$oHandle = null;
+		$sConfig = null;
+
+		if (is_file($this->m_sFile))
+		{
+			$oHandle = fopen($this->m_sFile, 'r');
+			$index = 0;
+			while (!flock($oHandle, LOCK_SH))
+			{
+				if ($index > 50)
+				{
+					throw new ConfigException("Could not read to configuration file", array('file' => $this->m_sFile));
+				}
+				usleep(100000);
+				$index++;
+			}
+			$sConfig = file_get_contents($this->m_sFile);
+		}
+		$this->oItopConfigParser = new iTopConfigParser($sConfig);
+		if ($oHandle !==null)
+		{
+			flock($oHandle, LOCK_UN);
+		}
+
 		$hFile = @fopen($sFileName, 'w');
 		if ($hFile !== false)
 		{
@@ -1937,30 +1992,37 @@ class Config
 				// Write all values that are either always visible or present in the cloned config file
 				if ($aSettingInfo['show_in_conf_sample'] || (!empty($aSettingInfo['source_of_value']) && ($aSettingInfo['source_of_value'] != 'unknown')))
 				{
-					$sType = $aSettingInfo['type'];
-					switch ($sType)
-					{
-						case 'bool':
-							$sSeenAs = $aSettingInfo['value'] ? 'true' : 'false';
-							break;
-						default:
-							$sSeenAs = self::PrettyVarExport($aSettingInfo['value'], "\t");
-					}
 					fwrite($hFile, "\n");
+
 					if (isset($aSettingInfo['description']))
 					{
 						fwrite($hFile, "\t// $sPropCode: {$aSettingInfo['description']}\n");
 					}
+
 					if (isset($aSettingInfo['default']))
 					{
-						$default = $aSettingInfo['default'];
-						if ($aSettingInfo['type'] == 'bool')
+
+						if (isset($this->m_aCanOverrideSettings[$sPropCode]) && $this->m_aCanOverrideSettings[$sPropCode])
 						{
-							$default = $default ? 'true' : 'false';
+							$aParserValue = $this->oItopConfigParser->GetVarValue('MySettings', $sPropCode);
 						}
-						fwrite($hFile,
-							"\t//\tdefault: ".self::PrettyVarExport($aSettingInfo['default'], "\t//\t\t", true)."\n");
+						else
+						{
+							$aParserValue = array('found' => false);
+						}
+						$sComment = self::PrettyVarExport($aParserValue,$aSettingInfo['default'], "\t//\t\t", true);
+						fwrite($hFile,"\t//\tdefault: {$sComment}\n");
 					}
+
+					if (isset($this->m_aCanOverrideSettings[$sPropCode]) && $this->m_aCanOverrideSettings[$sPropCode])
+					{
+						$aParserValue = $this->oItopConfigParser->GetVarValue('MySettings', $sPropCode);
+					}
+					else
+					{
+						$aParserValue = array('found' => false);
+					}
+					$sSeenAs = self::PrettyVarExport($aParserValue,$aSettingInfo['value'], "\t");
 					fwrite($hFile, "\t'$sPropCode' => $sSeenAs,\n");
 				}
 			}
@@ -1974,7 +2036,7 @@ class Config
 				fwrite($hFile, "\t'$sModule' => array (\n");
 				foreach ($aProperties as $sProperty => $value)
 				{
-					$sNiceExport = self::PrettyVarExport($value, "\t\t");
+					$sNiceExport = self::PrettyVarExport($this->oItopConfigParser->GetVarValue('MyModuleSettings', $sProperty), $value, "\t\t");
 					fwrite($hFile, "\t\t'$sProperty' => $sNiceExport,\n");
 				}
 				fwrite($hFile, "\t),\n");
@@ -1987,16 +2049,29 @@ class Config
 			fwrite($hFile, " *\n");
 			fwrite($hFile, " */\n");
 			fwrite($hFile, "\$MyModules = array(\n");
-			fwrite($hFile, "\t'addons' => array (\n");
-			foreach ($this->m_aAddons as $sKey => $sFile)
+			$aParserValue = $this->oItopConfigParser->GetVarValue('MyModules', 'addons');
+			if ($aParserValue['found'])
 			{
-				fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
+				fwrite($hFile, "\t'addons' => {$aParserValue['value']},\n");
+			}
+			else
+			{
+				fwrite($hFile, "\t'addons' => array (\n");
+				foreach ($this->m_aAddons as $sKey => $sFile)
+				{
+					fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
+				}
+				fwrite($hFile, "\t),\n");
 			}
-			fwrite($hFile, "\t),\n");
 			fwrite($hFile, ");\n");
 			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
 
-			return fclose($hFile);
+			$bReturn = fclose($hFile);
+
+			utils::SetConfig($this);
+			FileLog::RenameLegacyLogFiles();
+
+			return $bReturn;
 		}
 		else
 		{
@@ -2004,16 +2079,16 @@ class Config
 		}
 	}
 
-    /**
-     * Helper function to initialize a configuration from the page arguments
-     *
-     * @param array $aParamValues
-     * @param string|null $sModulesDir
-     * @param bool $bPreserveModuleSettings
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     */
+	/**
+	 * Helper function to initialize a configuration from the page arguments
+	 *
+	 * @param array $aParamValues
+	 * @param string|null $sModulesDir
+	 * @param bool $bPreserveModuleSettings
+	 *
+	 * @throws \Exception
+	 * @throws \CoreException
+	 */
 	public function UpdateFromParams($aParamValues, $sModulesDir = null, $bPreserveModuleSettings = false)
 	{
 		if (isset($aParamValues['application_path']))
@@ -2048,7 +2123,7 @@ class Config
 			$this->Set('db_name', $sDBName);
 			$this->Set('db_subname', $aParamValues['db_prefix']);
 
-			$bDbTlsEnabled = (bool) $aParamValues['db_tls_enabled'];
+			$bDbTlsEnabled = (bool)$aParamValues['db_tls_enabled'];
 			if ($bDbTlsEnabled)
 			{
 				$this->Set('db_tls.enabled', $bDbTlsEnabled, 'UpdateFromParams');
@@ -2059,9 +2134,12 @@ class Config
 				$this->Set('db_tls.enabled', $bDbTlsEnabled, null);
 			}
 			$sDbTlsCa = $bDbTlsEnabled ? $aParamValues['db_tls_ca'] : null;
-			if (isset($sDbTlsCa) && !empty($sDbTlsCa)) {
+			if (isset($sDbTlsCa) && !empty($sDbTlsCa))
+			{
 				$this->Set('db_tls.ca', $sDbTlsCa, 'UpdateFromParams');
-			} else {
+			}
+			else
+			{
 				// empty parameter : we don't want it in the file
 				$this->Set('db_tls.ca', null, null);
 			}
@@ -2145,13 +2223,13 @@ class Config
 		$this->SetAddOns($aAddOns);
 	}
 
-    /**
-     * Helper: for an array of string, change the prefix when found
-     *
-     * @param array $aStrings
-     * @param string $sSearchPrefix
-     * @param string $sNewPrefix
-     */
+	/**
+	 * Helper: for an array of string, change the prefix when found
+	 *
+	 * @param array $aStrings
+	 * @param string $sSearchPrefix
+	 * @param string $sNewPrefix
+	 */
 	protected static function ChangePrefix(&$aStrings, $sSearchPrefix, $sNewPrefix)
 	{
 		foreach ($aStrings as &$sFile)
@@ -2163,13 +2241,13 @@ class Config
 		}
 	}
 
-    /**
-     * Obsolete: kept only for backward compatibility of the Toolkit
-     * Quick and dirty way to clone a config file into another environment
-     *
-     * @param string $sSourceEnv
-     * @param string $sTargetEnv
-     */
+	/**
+	 * Obsolete: kept only for backward compatibility of the Toolkit
+	 * Quick and dirty way to clone a config file into another environment
+	 *
+	 * @param string $sSourceEnv
+	 * @param string $sTargetEnv
+	 */
 	public function ChangeModulesPath($sSourceEnv, $sTargetEnv)
 	{
 		// Now does nothing since the includes are built into the environment itself
@@ -2178,6 +2256,7 @@ class Config
 	/**
 	 * Pretty format a var_export'ed value so that (if possible) the identation is preserved on every line
 	 *
+	 * @param array $aParserValue
 	 * @param mixed $value The value to export
 	 * @param string $sIndentation The string to use to indent the text
 	 * @param bool $bForceIndentation Forces the identation (enven if it breaks/changes an eval, for example to ouput a
@@ -2185,8 +2264,13 @@ class Config
 	 *
 	 * @return string The indented export string
 	 */
-	protected static function PrettyVarExport($value, $sIndentation, $bForceIndentation = false)
+	protected static function PrettyVarExport($aParserValue, $value, $sIndentation, $bForceIndentation = false)
 	{
+		if ($aParserValue['found'])
+		{
+			return $aParserValue['value'];
+		}
+
 		$sExport = var_export($value, true);
 		$sNiceExport = str_replace(array("\r\n", "\n", "\r"), "\n".$sIndentation, trim($sExport));
 		if (!$bForceIndentation)

core/contexttag.class.inc.php

@@ -19,14 +19,14 @@
 
 /**
  * Simple helper class for keeping track of the context inside the call stack
- * 
+ *
  * To check (anywhere in the code) if a particular context tag is present
  * in the call stack simply do:
- * 
+ *
  * if (ContextTag::Check(<the_tag>)) ...
- * 
+ *
  * For example to know if the code is being executed in the context of a portal do:
- * 
+ *
  * if (ContextTag::Check('GUI:Portal'))
  *
  * @copyright   Copyright (C) 2016-2017 Combodo SARL
@@ -35,8 +35,15 @@
 
 class ContextTag
 {
+	const TAG_PORTAL = 'GUI:Portal';
+	const TAG_CRON = 'CRON';
+	const TAG_CONSOLE = 'GUI:Console';
+	const TAG_SETUP = 'Setup';
+	const TAG_SYNCHRO = 'Synchro';
+	const TAG_REST = 'REST/JSON';
+
 	protected static $aStack = array();
-	
+
 	/**
 	 * Store a context tag on the stack
 	 * @param string $sTag
@@ -46,6 +53,11 @@ class ContextTag
 		static::$aStack[] = $sTag;
 	}
 	
+	public static function AddContext($sTag)
+	{
+		static::$aStack[] = $sTag;
+	}
+
 	/**
 	 * Cleanup the context stack
 	 */
@@ -53,7 +65,7 @@ class ContextTag
 	{
 		array_pop(static::$aStack);
 	}
-	
+
 	/**
 	 * Check if a given tag is present in the stack
 	 * @param string $sTag
@@ -63,13 +75,53 @@ class ContextTag
 	{
 		return in_array($sTag, static::$aStack);
 	}
-	
+
 	/**
 	 * Get the whole stack as an array
-	 * @return hash
+	 * @return array
 	 */
 	public static function GetStack()
 	{
 		return static::$aStack;
 	}
-}
+
+	/**
+	 * Get all the predefined context tags
+	 * @return array
+	 */
+	public static function GetTags()
+	{
+		$aRawTags = array(
+			ContextTag::TAG_REST,
+			ContextTag::TAG_SYNCHRO,
+			ContextTag::TAG_SETUP,
+			ContextTag::TAG_CONSOLE,
+			ContextTag::TAG_CRON,
+			ContextTag::TAG_PORTAL);
+
+		$aTags = array();
+
+		foreach ($aRawTags as $sRawTag)
+		{
+			$aTags[$sRawTag] = Dict::S("Core:Context={$sRawTag}");
+		}
+
+		$aPortalsConf = PortalDispatcherData::GetData();
+		$aDispatchers = array();
+		foreach ($aPortalsConf as $sPortalId => $aConf)
+		{
+			$sHandlerClass = $aConf['handler'];
+			$aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
+		}
+
+		foreach ($aDispatchers as $sPortalId => $oDispatcher)
+		{
+			if ($sPortalId != 'backoffice')
+			{
+				$aTags['Portal:'.$sPortalId] = $oDispatcher->GetLabel();
+			}
+		}
+
+		return $aTags;
+	}
+}

core/coreexception.class.inc.php

@@ -183,6 +183,30 @@ class CoreCannotSaveObjectException extends CoreException
 	}
 }
 
+/**
+ * @since 2.7.0 N°2555
+ */
+class CorePortalInvalidActionRuleException extends CoreException
+{
+
+}
+
+/**
+ * @since 2.7.0 N°2555
+ */
+class CoreOqlException extends CoreException
+{
+
+}
+
+/**
+ * @since 2.7.0 N°2555
+ */
+class CoreOqlMultipleResultsForbiddenException extends CoreOqlException
+{
+
+}
+
 class CoreWarning extends CoreException
 {
 }
@@ -213,3 +237,13 @@ class ArchivedObjectException extends CoreException
 class InvalidConfigParamException extends CoreException
 {
 }
+
+
+/**
+ * Throwned when the password is not valid
+ *
+ * @since 2.7.0
+ */
+class InvalidPasswordAttributeOneWayPassword extends CoreException
+{
+}

core/counter.class.inc.php

@@ -0,0 +1,251 @@
+<?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
+ */
+
+
+/**
+ * Class ItopCounter
+ *
+ */
+final class ItopCounter
+{
+
+	/**
+	 * Key based counter.
+	 * The counter is protected against concurrency script.
+	 *
+	 * @param $sCounterName
+	 * @param null|callable $oNewObjectValueProvider optional callable that must return an integer. Used when no key is found
+	 *
+	 * @return int the counter starting at
+	 *  * `0` when no $oNewObjectValueProvider is given (or null)
+	 *  * `$oNewObjectValueProvider() + 1` otherwise
+	 *
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 * @throws \Exception
+	 */
+	public static function Inc($sCounterName, $oNewObjectValueProvider = null)
+	{
+		$sSelfClassName = self::class;
+		$sMutexKeyName = "{$sSelfClassName}-{$sCounterName}";
+		$oiTopMutex = new iTopMutex($sMutexKeyName);
+		$oiTopMutex->Lock();
+
+		$bIsInsideTransaction = CMDBSource::IsInsideTransaction();
+		if ($bIsInsideTransaction)
+		{
+			// # Transaction isolation hack:
+			// When inside a transaction, we need to open a new connection for the counter.
+			// So it is visible immediately to the connections outside of the transaction.
+			// Either way, the lock is not long enought, and there would be duplicate ref.
+			//
+			// SELECT ... FOR UPDATE would have also worked but with the cost of extra long lock (until the commit),
+			// we did not wanted this! As opening a short connection is less prone to starving than a long running one.
+			// Plus it would trigger way more deadlocks!
+			$hDBLink = self::InitMySQLSession();
+		}
+		else
+		{
+			$hDBLink = CMDBSource::GetMysqli();
+		}
+
+		try
+		{
+			$oFilter = DBObjectSearch::FromOQL('SELECT KeyValueStore WHERE key_name=:key_name AND namespace=:namespace', array(
+				'key_name'  => $sCounterName,
+				'namespace' => $sSelfClassName,
+			));
+			$oAttDef = MetaModel::GetAttributeDef('KeyValueStore', 'value');
+			$aAttToLoad = array('KeyValueStore' => array('value' => $oAttDef));
+			$sSql = $oFilter->MakeSelectQuery(array(), array(), $aAttToLoad);
+			$hResult = mysqli_query($hDBLink, $sSql);
+			$aCounter = mysqli_fetch_array($hResult, MYSQLI_NUM);
+			mysqli_free_result($hResult);
+
+			//Rebuild the filter, as the MakeSelectQuery polluted the orignal and it cannot be reused
+			$oFilter = DBObjectSearch::FromOQL('SELECT KeyValueStore WHERE key_name=:key_name AND namespace=:namespace', array(
+				'key_name'  => $sCounterName,
+				'namespace' => $sSelfClassName,
+			));
+
+			if (is_null($aCounter))
+			{
+				if (null != $oNewObjectValueProvider)
+				{
+					$iComputedValue = $oNewObjectValueProvider();
+				}
+				else
+				{
+					$iComputedValue = 0;
+				}
+
+				$iCurrentValue = $iComputedValue + 1;
+
+				$aQueryParams = array(
+					'key_name'  => $sCounterName,
+					'value'     => "$iCurrentValue",
+					'namespace' => $sSelfClassName,
+				);
+
+				$sSql = $oFilter->MakeInsertQuery($aQueryParams);
+			}
+			else
+			{
+				$iCurrentValue = (int) $aCounter[1];
+				$iCurrentValue++;
+				$aQueryParams = array(
+					'value'     => "$iCurrentValue",
+				);
+
+				$sSql = $oFilter->MakeUpdateQuery($aQueryParams);
+			}
+
+			$hResult = mysqli_query($hDBLink, $sSql);
+
+		}
+		catch(Exception $e)
+		{
+			IssueLog::Error($e->getMessage());
+			throw $e;
+		}
+		finally
+		{
+			if ($bIsInsideTransaction)
+			{
+				mysqli_close($hDBLink);
+			}
+			$oiTopMutex->Unlock();
+		}
+
+		return $iCurrentValue;
+	}
+
+	/**
+	 * handle a counter for the root class of given $sLeafClass.
+	 * If no counter exist initialize it with the `max(id) + 1`
+	 *
+	 *
+	 *
+	 * @param $sLeafClass
+	 *
+	 * @return int
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
+	 * @throws \CoreException
+	 * @throws \CoreOqlMultipleResultsForbiddenException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public static function IncClass($sLeafClass)
+	{
+		$sRootClass = MetaModel::GetRootClass($sLeafClass);
+
+		$oNewObjectCallback = function() use ($sRootClass)
+		{
+			$sRootTable = MetaModel::DBGetTable($sRootClass);
+			$sIdField = MetaModel::DBGetKey($sRootClass);
+
+			return CMDBSource::QueryToScalar("SELECT max(`$sIdField`) FROM `$sRootTable`");
+		};
+
+		return self::Inc($sRootClass, $oNewObjectCallback);
+	}
+
+	/**
+	 * @return \mysqli
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 * @throws \MySQLException
+	 */
+	private static function InitMySQLSession()
+	{
+		$oConfig = utils::GetConfig();
+		$sDBHost = $oConfig->Get('db_host');
+		$sDBUser = $oConfig->Get('db_user');
+		$sDBPwd  = $oConfig->Get('db_pwd');
+		$sDBName = $oConfig->Get('db_name');
+		$bDBTlsEnabled = $oConfig->Get('db_tls.enabled');
+		$sDBTlsCA = $oConfig->Get('db_tls.ca');
+
+		$hDBLink = CMDBSource::GetMysqliInstance($sDBHost, $sDBUser, $sDBPwd, $sDBName, $bDBTlsEnabled, $sDBTlsCA, false);
+
+		if (!$hDBLink)
+		{
+			throw new Exception("Could not connect to the DB server (host=$sDBHost, user=$sDBUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
+		}
+
+		return $hDBLink;
+	}
+}
+
+
+
+/**
+ * Persistent classes for a CMDB
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class KeyValueStore extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array(
+			'category' => '',
+			'key_type' => 'autoincrement',
+			'name_attcode' => array('key_name'),
+			'state_attcode' => '',
+			'reconc_keys' => array(''),
+			'db_table' => 'key_value_store',
+			'db_key_field' => 'id',
+			'db_finalclass_field' => '',
+			'indexes' => array (
+				array (
+					0 => 'key_name',
+					1 => 'namespace',
+				),
+			),);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("namespace", array("allowed_values"=>null, "sql"=>'namespace', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
+		MetaModel::Init_AddAttribute(new AttributeString("key_name", array("allowed_values"=>null, "sql"=>'key_name', "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
+		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>'value', "default_value"=>'0', "is_null_allowed"=>false, "depends_on"=>array(), "always_load_in_tables"=>false)));
+
+		MetaModel::Init_SetZListItems('details', array (
+			0 => 'key_name',
+			1 => 'value',
+			2 => 'namespace',
+		));
+		MetaModel::Init_SetZListItems('standard_search', array (
+			0 => 'key_name',
+			1 => 'value',
+			2 => 'namespace',
+		));
+		MetaModel::Init_SetZListItems('list', array (
+			0 => 'key_name',
+			1 => 'value',
+			2 => 'namespace',
+		));
+		;
+	}
+
+
+}

core/dbobject.class.php

@@ -1912,7 +1912,7 @@ abstract class DBObject implements iDisplay
 
 			return "Bad type";
 		}
-		elseif ($oAtt instanceof AttributeClassAttCodeSet)
+		elseif (($oAtt instanceof AttributeClassAttCodeSet) || ($oAtt instanceof AttributeEnumSet))
 		{
 			if (is_string($toCheck))
 			{
@@ -2003,6 +2003,8 @@ abstract class DBObject implements iDisplay
 				continue;
 			}
 
+			// No iTopMutex so there might be concurrent access !
+			// But the necessary lock would have a high performance cost :(
 			$bHasDuplicates = $this->HasObjectsInDbForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties);
 			if ($bHasDuplicates)
 			{
@@ -2394,6 +2396,24 @@ abstract class DBObject implements iDisplay
 		}
 	}
 
+	/**
+	 * List the changed attributes that were persisted by an update.
+	 * 
+	 * @see \DBObject::ListChanges() use DBObject::ListChanges() if your code is BEFORE the update 
+	 * 
+	 * @return array
+	 */
+	public function ListChangesUpdated()
+	{
+		if (empty($this->m_aChanges))
+		{
+			return array();
+		}
+
+		return $this->m_aChanges;
+	}
+
+	
     /**
      * Whether or not an object was modified since last read from the DB
      * (ie: does it differ from the DB ?)
@@ -2735,6 +2755,11 @@ abstract class DBObject implements iDisplay
 				$this->DBInsertSingleTable($sParentClass);
 			}
 
+			$this->OnObjectKeyReady();
+
+			$this->DBWriteLinks();
+			$this->WriteExternalAttributes();
+
 			if ($bIsTransactionEnabled)
 			{
 				CMDBSource::Query('COMMIT');
@@ -2749,11 +2774,6 @@ abstract class DBObject implements iDisplay
 			throw $e;
 		}
 
-		$this->OnObjectKeyReady();
-
-        $this->DBWriteLinks();
-		$this->WriteExternalAttributes();
-
 		$this->m_bIsInDB = true;
 		$this->m_bDirty = false;
 		foreach ($this->m_aCurrValues as $sAttCode => $value)
@@ -2925,16 +2945,13 @@ abstract class DBObject implements iDisplay
     /**
      * @internal
      *
+     * @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
      *
      * @return int|null
-     * @throws ArchivedObjectException
-     * @throws CoreCannotSaveObjectException
      * @throws CoreException
-     * @throws CoreUnexpectedValue
-     * @throws CoreWarning
-     * @throws MySQLException
-     * @throws OQLException
      */
 	public function DBInsertTracked(CMDBChange $oChange)
 	{
@@ -2945,6 +2962,9 @@ abstract class DBObject implements iDisplay
     /**
      * @internal
      *
+     * @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
      *
      * @return int
@@ -3289,6 +3309,9 @@ abstract class DBObject implements iDisplay
      *
      * @internal
      *
+     * @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
      *
      * @return int
@@ -3558,9 +3581,12 @@ abstract class DBObject implements iDisplay
     /**
      * @internal
      *
+     * @deprecated 2.7.0 N°2361 simply use {@link DBDelete} instead.
+     *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
+     *
      * @param CMDBChange $oChange
-     * @param null       $bSkipStrongSecurity
-     * @param null       $oDeletionPlan
+     * @param boolean $bSkipStrongSecurity
+     * @param \DeletionPlan $oDeletionPlan
      *
      * @throws ArchivedObjectException
      * @throws CoreCannotSaveObjectException
@@ -3648,7 +3674,8 @@ abstract class DBObject implements iDisplay
 		if (!array_key_exists($sStimulusCode, $aStateTransitions))
 		{
 			// This simulus has no effect in the current state... do nothing
-			return true;
+			IssueLog::Error(get_class($this).": Transition $sStimulusCode is not allowed in ".$this->Get($sStateAttCode));
+			return false;
 		}
 		$aTransitionDef = $aStateTransitions[$sStimulusCode];
 
@@ -4108,11 +4135,13 @@ abstract class DBObject implements iDisplay
 	}
 
     /**
-     * This method is called after the object is updated into DB. You can get changes by calling {@link ListChanges}.
+     * This method is called after the object is updated into DB. You can get changes using @link m_aChanges}.
+     *
+     * Warning : do not use {@link ListChanges} as it will return an empty array.
      *
      * @overwritable-hook You can extend this method in order to provide your own logic.
      *
-     * @since 2.7.0 N°2293 can access object changes by calling {@link ListChanges}
+     * @since 2.7.0 N°2293 can access object changes using {@link m_aChanges}
      */
 	protected function AfterUpdate()
 	{

core/dbobjectsearch.class.php

@@ -337,7 +337,7 @@ class DBObjectSearch extends DBSearch
 		$this->m_aParams = array_merge($this->m_aParams, $oFilter->m_aParams);
 	}
 
-	protected function RenameParam($sOldName, $sNewName)
+	public function RenameParam($sOldName, $sNewName)
 	{
 		$this->m_oSearchCondition->RenameParam($sOldName, $sNewName);
 		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
@@ -622,7 +622,7 @@ class DBObjectSearch extends DBSearch
 		{
 			if (!$oAttDef->IsScalar()) continue;
 			if ($oAttDef->IsExternalKey()) continue;
-			if ($oAttDef instanceof AttributePassword) continue;
+			if (!$oAttDef->IsSearchable()) continue;
 			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
 		}
 		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
@@ -699,6 +699,37 @@ class DBObjectSearch extends DBSearch
 		}
 	}
 
+	/**
+	 * Rename aliases of nested queries to avoid duplicates with main query
+	 *
+	 * @param array $aClassAliases array of alias => class for the main query
+	 * @param array $aAliasTranslation translation table of main query to apply to nested queries
+	 */
+	public function RenameNestedQueriesAliasesInNameSpace($aClassAliases, $aAliasTranslation = array())
+	{
+		$this->GetCriteria()->Browse(function ($oNode) use ($aClassAliases, $aAliasTranslation) {
+			if ($oNode instanceof NestedQueryExpression)
+			{
+				$oNestedQuery = $oNode->GetNestedQuery();
+				$oNestedQuery->RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation);
+			}
+		});
+	}
+
+	public function RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation = array())
+	{
+		// Recurse in nested queries
+		$this->RenameNestedQueriesAliasesInNameSpace($aClassAliases, $aAliasTranslation);
+		$this->AddToNameSpace($aClassAliases, $aAliasTranslation);
+		$this->TranslateConditions($aAliasTranslation, false, false);
+	}
+
+	public function TranslateConditions($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$oExpression = $this->GetCriteria()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		$this->ResetCondition();
+		$this->AddConditionExpression($oExpression);
+	}
 
 	// Browse the tree nodes recursively
 	//
@@ -873,6 +904,15 @@ class DBObjectSearch extends DBSearch
 		return $res;
 	}
 
+	/**
+	 * @param \DBObjectSearch $oFilter
+	 * @param string $sExtKeyAttCode
+	 * @param array $aClassAliases
+	 * @param array $aAliasTranslation
+	 * @param int $iOperatorCode
+	 *
+	 * @throws \CoreException
+	 */
 	protected function AddCondition_PointingTo_InNameSpace(DBObjectSearch $oFilter, $sExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
 	{
 		// Find the node on which the new tree must be attached (most of the time it is "this")
@@ -883,9 +923,10 @@ class DBObjectSearch extends DBSearch
 		{
 			foreach ($oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode] as $oExisting)
 			{
+				/** @var DBObjectSearch $oExisting */
 				if ($oExisting->GetClass() == $oFilter->GetClass())
 				{
-					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
+					$oExisting->MergeWith_InNamespace($oFilter, $aClassAliases, $aAliasTranslation);
 					$bMerged = true;
 					break;
 				}
@@ -953,7 +994,7 @@ class DBObjectSearch extends DBSearch
 		$this->RecomputeClassList($this->m_aClasses);
 	}
 
-	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
+	protected function AddCondition_ReferencedBy_InNameSpace(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
 	{
 		$sForeignClass = $oFilter->GetClass();
 
@@ -967,7 +1008,7 @@ class DBObjectSearch extends DBSearch
 			{
 				if ($oExisting->GetClass() == $oFilter->GetClass())
 				{
-					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
+					$oExisting->MergeWith_InNamespace($oFilter, $aClassAliases, $aAliasTranslation);
 					$bMerged = true;
 					break;
 				}
@@ -980,10 +1021,115 @@ class DBObjectSearch extends DBSearch
 		}
 	}
 
+	/**
+	 * Filter this search with another search.
+	 * Initial search is unmodified.
+	 * The difference with Intersect, is that an alias can be provided,
+	 * the filtered class does not need to be the first joined class.
+	 *
+	 * @param string $sClassAlias class being filtered
+	 * @param DBSearch $oFilter Filter to apply
+	 *
+	 * @return DBSearch The filtered search
+	 * @throws \CoreException
+	 */
+	public function Filter($sClassAlias, DBSearch $oFilter)
+	{
+		// If the conditions are the correct ones for Intersect
+		if (($this->GetFirstJoinedClass() == $oFilter->GetFirstJoinedClass()))
+		{
+			return $this->Intersect($oFilter);
+		}
+
+		/** @var \DBObjectSearch $oFilteredSearch */
+		$oFilteredSearch = $this->DeepClone();
+		$oFilterExpression = self::FilterSubClass($oFilteredSearch, $sClassAlias, $oFilter, $this->m_aClasses);
+		if ($oFilterExpression === false)
+		{
+			throw new CoreException("Limitation: cannot filter search");
+		}
+
+		$oFilteredSearch->AddConditionExpression($oFilterExpression);
+
+		return $oFilteredSearch;
+	}
+
+	/**
+	 * Filter "in place" the search (filtered part is replaced in the initial search)
+	 *
+	 * @param DBObjectSearch $oSearch Search to filter, modified with the given filter
+	 * @param string $sClassAlias class to filter
+	 * @param \DBSearch $oFilter Filter to apply
+	 *
+	 * @return \Expression|false
+	 * @throws \CoreException
+	 */
+	private static function FilterSubClass(DBObjectSearch &$oSearch, $sClassAlias, DBSearch $oFilter, $aRootClasses)
+	{
+		if (($oSearch->GetFirstJoinedClassAlias() == $sClassAlias))
+		{
+			$oSearch->ResetCondition();
+			$oSearch = $oSearch->IntersectSubClass($oFilter, $aRootClasses);
+			return $oSearch->GetCriteria();
+		}
+
+		/** @var Expression $oFilterExpression */
+		// Search in the filter tree where is the correct DBSearch
+		foreach ($oSearch->m_aPointingTo as $sExtKey => $aPointingTo)
+		{
+			foreach ($aPointingTo as $iOperatorCode => $aFilters)
+			{
+				foreach ($aFilters as $index => $oExtFilter)
+				{
+					$oFilterExpression = self::FilterSubClass($oExtFilter, $sClassAlias, $oFilter, $aRootClasses);
+					if ($oFilterExpression !== false)
+					{
+						$oSearch->m_aPointingTo[$sExtKey][$iOperatorCode][$index] = $oExtFilter;
+						return $oFilterExpression;
+					}
+				}
+			}
+		}
+
+		foreach($oSearch->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $index => $oForeignFilter)
+					{
+						$oFilterExpression = self::FilterSubClass($oForeignFilter, $sClassAlias, $oFilter, $aRootClasses);
+						if ($oFilterExpression !== false)
+						{
+							$oSearch->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode][$index] = $oForeignFilter;
+							return $oFilterExpression;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @inheritDoc
+	 * @throws \CoreException
 	 */
 	public function Intersect(DBSearch $oFilter)
+	{
+		return $this->IntersectSubClass($oFilter, $this->m_aClasses);
+	}
+
+	/**
+	 * @param \DBSearch $oFilter
+	 * @param array $aRootClasses classes of the root search (for aliases)
+	 *
+	 * @return \DBUnionSearch|mixed
+	 * @throws \CoreException
+	 */
+	protected function IntersectSubClass(DBSearch $oFilter, $aRootClasses)
 	{
 		if ($oFilter instanceof DBUnionSearch)
 		{
@@ -999,15 +1145,12 @@ class DBObjectSearch extends DBSearch
 		foreach ($aFilters as $oRightFilter)
 		{
 			// Limitation: the queried class must be the first declared class
-			if ($this->GetFirstJoinedClassAlias() != $this->GetClassAlias())
-			{
-				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$this->GetClass()} AS {$this->GetClassAlias()}) is not the first joined class ({$this->GetFirstJoinedClass()} AS {$this->GetFirstJoinedClassAlias()})");
-			}
 			if ($oRightFilter->GetFirstJoinedClassAlias() != $oRightFilter->GetClassAlias())
 			{
 				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$oRightFilter->GetClass()} AS {$oRightFilter->GetClassAlias()}) is not the first joined class ({$oRightFilter->GetFirstJoinedClass()} AS {$oRightFilter->GetFirstJoinedClassAlias()})");
 			}
 
+			/** @var \DBObjectSearch $oLeftFilter */
 			$oLeftFilter = $this->DeepClone();
 			$oRightFilter = $oRightFilter->DeepClone();
 
@@ -1017,14 +1160,14 @@ class DBObjectSearch extends DBSearch
 				$oLeftFilter->AllowAllData();
 			}
 
-			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
+			if ($oLeftFilter->GetFirstJoinedClass() != $oRightFilter->GetClass())
 			{
-				if (MetaModel::IsParentClass($oLeftFilter->GetClass(), $oRightFilter->GetClass()))
+				if (MetaModel::IsParentClass($oLeftFilter->GetFirstJoinedClass(), $oRightFilter->GetClass()))
 				{
 					// Specialize $oLeftFilter
-					$oLeftFilter->ChangeClass($oRightFilter->GetClass());
+					$oLeftFilter->ChangeClass($oRightFilter->GetClass(), $oLeftFilter->GetFirstJoinedClassAlias());
 				}
-				elseif (MetaModel::IsParentClass($oRightFilter->GetClass(), $oLeftFilter->GetClass()))
+				elseif (MetaModel::IsParentClass($oRightFilter->GetFirstJoinedClass(), $oLeftFilter->GetClass()))
 				{
 					// Specialize $oRightFilter
 					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
@@ -1036,7 +1179,9 @@ class DBObjectSearch extends DBSearch
 			}
 
 			$aAliasTranslation = array();
-			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oLeftFilter->m_aClasses, $aAliasTranslation);
+			$oLeftFilter->RenameNestedQueriesAliasesInNameSpace($aRootClasses, $aAliasTranslation);
+			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $aRootClasses, $aAliasTranslation);
+			$oRightFilter->RenameNestedQueriesAliasesInNameSpace($aRootClasses, $aAliasTranslation);
 			$oLeftFilter->TransferConditionExpression($oRightFilter, $aAliasTranslation);
 			$aSearches[] = $oLeftFilter;
 		}
@@ -1051,15 +1196,22 @@ class DBObjectSearch extends DBSearch
 		}
 	}
 
+	/**
+	 * @param DBObjectSearch $oFilter
+	 * @param array $aClassAliases
+	 * @param array $aAliasTranslation
+	 *
+	 * @throws CoreException
+	 */
 	protected function MergeWith_InNamespace($oFilter, &$aClassAliases, &$aAliasTranslation)
 	{
-		if ($this->GetClass() != $oFilter->GetClass())
+		if ($this->GetFirstJoinedClass() != $oFilter->GetClass())
 		{
-			throw new CoreException("Attempting to merge a filter of class '{$this->GetClass()}' with a filter of class '{$oFilter->GetClass()}'");
+			throw new CoreException("Attempting to merge a filter of class '{$this->GetFirstJoinedClass()}' with a filter of class '{$oFilter->GetClass()}'");
 		}
 
 		// Translate search condition into our aliasing scheme
-		$aAliasTranslation[$oFilter->GetClassAlias()]['*'] = $this->GetClassAlias(); 
+		$aAliasTranslation[$oFilter->GetClassAlias()]['*'] = $this->GetFirstJoinedClassAlias();
 
 		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
 		{
@@ -1399,12 +1551,97 @@ class DBObjectSearch extends DBSearch
 		{
 			return new IntervalExpression($oExpression->GetValue(), $oExpression->GetUnit());
 		}
+		elseif ($oExpression instanceof NestedQueryOqlExpression)
+		{
+			return NestedQueryExpression::FromOQLObjectQuery($oExpression->GetOQLObjectQuery());
+		}
 		else
 		{
 			throw new CoreException('Unknown expression type', array('class'=>get_class($oExpression), 'query'=>$sQuery));
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see DBSearch::ToJSON()
+	 */
+	public function ToJSON()
+	{
+		$aRet = array('selects' => array(), 'joins' => array(), 'where' => array());
+
+		$aParams = array_merge($this->m_aParams);
+		$aParams = MetaModel::PrepareQueryArguments($aParams);
+
+		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
+		{
+			$aRet['selects'][] = array('class' => $sClass, 'alias' => $sAlias);
+		}
+		$this->JoinsToJSON($aRet);
+
+		$aRet['condition'] = $this->m_oSearchCondition->ToJSON($aParams, true);
+		return $aRet;
+	}
+
+	/**
+	 * Export the JOIN operations to a structure (array of arrays) suitable for JSON export
+	 *
+	 * @internal
+	 *
+	 * @param mixed[string] $aRet
+	 * @return void
+	 */
+	protected function JoinsToJSON(&$aRet)
+	{
+		foreach($this->m_aPointingTo as $sExtKey => $aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
+				foreach($aFilter as $oFilter)
+				{
+					$aRet['joins'][] = array(
+						'src' => $this->GetFirstJoinedClass(),
+						'src_alias' => $this->GetFirstJoinedClassAlias(),
+						'target' => $oFilter->GetFirstJoinedClass(),
+						'target_alias' => $oFilter->GetFirstJoinedClassAlias(),
+						'foreign_key' => $sExtKey,
+						'operator' => $sOperator,
+					);
+					$oFilter->JoinsToJSON($aRet);
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$aRet['joins'][] = array(
+							'src' => $oForeignFilter->GetFirstJoinedClass(),
+							'src_alias' => $oForeignFilter->GetFirstJoinedClassAlias(),
+							'target' => $this->GetFirstJoinedClass(),
+							'target_alias' => $this->GetFirstJoinedClassAlias(),
+							'foreign_key' => $sForeignExtKeyAttCode,
+							'operator' => $sOperator,
+						);
+						$oForeignFilter->JoinsToJSON($aRet);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param \OqlQuery $oOqlQuery
+	 * @param string $sQuery
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public function InitFromOqlQuery(OqlQuery $oOqlQuery, $sQuery)
 	{
 		$oModelReflection = new ModelReflectionRuntime();
@@ -1521,6 +1758,10 @@ class DBObjectSearch extends DBSearch
 		foreach ($oOqlQuery->GetSelectedClasses() as $oClassDetails)
 		{
 			$sClassToSelect = $oClassDetails->GetValue();
+			if (!array_key_exists($sClassToSelect, $aAliases))
+			{
+				throw new CoreException("$sClassToSelect is not a valid alias");
+			}
 			$this->m_aSelectedClasses[$sClassToSelect] = $aAliases[$sClassToSelect];
 		}
 		$this->m_aClasses = $aAliases;
@@ -1557,6 +1798,24 @@ class DBObjectSearch extends DBSearch
 		return $sRet;
 	}
 
+	/**
+	 * Generate an INSERT statement.
+	 * Note : unlike `RenderUpdate` and `RenderSelect`, it is limited to one and only one table.
+	 *
+	 * @param array $aValues is an array of $sAttCode => $value
+	 * @param array $aArgs
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 */
+	public function MakeInsertQuery($aValues, $aArgs = array())
+	{
+		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
+		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectUpdateQuery($aValues);
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$sRet = $oSQLQuery->RenderInsert($aScalarArgs);
+		return $sRet;
+	}
 
 	/**
 	 * Get an SQLObjectQuery from the search. This SQLObjectQuery can be rendered as a select, select group by, update or delete

core/dbobjectset.class.php

@@ -89,7 +89,8 @@ class DBObjectSet implements iDBObjectSetIterator
      * @api
 	 * 
 	 * @param DBSearch $oFilter The search filter defining the objects which are part of the set (multiple columns/objects per row are supported)
-	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending (true for ASC, false, for DESC)
+	 *    Example : array('name' => true, 'id' => false)
 	 * @param array $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
 	 * @param array $aExtendedDataSpec
 	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
@@ -217,73 +218,81 @@ class DBObjectSet implements iDBObjectSetIterator
      */
 	public function OptimizeColumnLoad($aAttToLoad)
 	{
-		if (is_null($aAttToLoad))
+		// Check that the structure is an array of array
+		if (!is_array($aAttToLoad))
 		{
 			$this->m_aAttToLoad = null;
+			return;
 		}
-		else
+		foreach ($aAttToLoad as $sAlias => $aAttCodes)
 		{
-			// Complete the attribute list with the attribute codes
-			$aAttToLoadWithAttDef = array();
-			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			if (!is_array($aAttCodes))
 			{
-				$aAttToLoadWithAttDef[$sClassAlias] = array();
-				if (array_key_exists($sClassAlias, $aAttToLoad))
+				$this->m_aAttToLoad = null;
+				return;
+			}
+		}
+
+		// Complete the attribute list with the attribute codes
+		$aAttToLoadWithAttDef = array();
+		foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+		{
+			$aAttToLoadWithAttDef[$sClassAlias] = array();
+			if (array_key_exists($sClassAlias, $aAttToLoad))
+			{
+				$aAttList = $aAttToLoad[$sClassAlias];
+				foreach($aAttList as $sAttToLoad)
 				{
-					$aAttList = $aAttToLoad[$sClassAlias];
-					foreach($aAttList as $sAttToLoad)
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
+					$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
+					if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
 					{
-						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
-						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
-						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+						// Add the external key friendly name anytime
+						$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
+						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
+
+						if (MetaModel::IsArchivable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
 						{
-							// Add the external key friendly name anytime
-							$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
-							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
+							// Add the archive flag if necessary
+							$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_archive_flag');
+							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_archive_flag'] = $oArchiveFlagAttDef;
+						}
 
-							if (MetaModel::IsArchivable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
-							{
-								// Add the archive flag if necessary
-								$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_archive_flag');
-								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_archive_flag'] = $oArchiveFlagAttDef;
-							}
-
-							if (MetaModel::IsObsoletable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
-							{
-								// Add the obsolescence flag if necessary
-								$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_obsolescence_flag');
-								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_obsolescence_flag'] = $oObsoleteFlagAttDef;
-							}
+						if (MetaModel::IsObsoletable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
+						{
+							// Add the obsolescence flag if necessary
+							$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_obsolescence_flag');
+							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_obsolescence_flag'] = $oObsoleteFlagAttDef;
 						}
 					}
 				}
-				// Add the friendly name anytime
-				$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
-				$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
+			}
+			// Add the friendly name anytime
+			$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
+			$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
 
-				if (MetaModel::IsArchivable($sClass))
-				{
-					// Add the archive flag if necessary
-					$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, 'archive_flag');
-					$aAttToLoadWithAttDef[$sClassAlias]['archive_flag'] = $oArchiveFlagAttDef;
-				}
-
-				if (MetaModel::IsObsoletable($sClass))
-				{
-					// Add the obsolescence flag if necessary
-					$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, 'obsolescence_flag');
-					$aAttToLoadWithAttDef[$sClassAlias]['obsolescence_flag'] = $oObsoleteFlagAttDef;
-				}
-
-				// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
-				if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttToLoadWithAttDef[$sClassAlias]))
-				{
-					$aAttToLoadWithAttDef[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
-				}
+			if (MetaModel::IsArchivable($sClass))
+			{
+				// Add the archive flag if necessary
+				$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, 'archive_flag');
+				$aAttToLoadWithAttDef[$sClassAlias]['archive_flag'] = $oArchiveFlagAttDef;
 			}
 
-			$this->m_aAttToLoad = $aAttToLoadWithAttDef;
+			if (MetaModel::IsObsoletable($sClass))
+			{
+				// Add the obsolescence flag if necessary
+				$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, 'obsolescence_flag');
+				$aAttToLoadWithAttDef[$sClassAlias]['obsolescence_flag'] = $oObsoleteFlagAttDef;
+			}
+
+			// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
+			if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttToLoadWithAttDef[$sClassAlias]))
+			{
+				$aAttToLoadWithAttDef[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
+			}
 		}
+
+		$this->m_aAttToLoad = $aAttToLoadWithAttDef;
 	}
 
     /**
@@ -971,7 +980,15 @@ class DBObjectSet implements iDBObjectSetIterator
 					}
 					else
 					{
-						$oRetObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+						try
+						{
+							$oRetObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+						}
+						catch (CoreException $e)
+						{
+							$this->m_iCurrRow++;
+							$oRetObj = $this->Fetch($sRequestedClassAlias);
+						}
 					}
 					break;
 				}

core/dbsearch.class.php

@@ -1,20 +1,21 @@
 <?php
-// Copyright (C) 2015-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-2019 Combodo SARL
+ *
+ * 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
+ */
 
 
 $bUseLegacyDBSearch = utils::GetConfig()->Get('use_legacy_dbsearch');
@@ -271,6 +272,10 @@ abstract class DBSearch
 	 */
 	abstract public function RenameAlias($sOldName, $sNewName);
 
+	abstract public function RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation = array());
+
+	abstract public function TranslateConditions($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
+
     /**
      * @internal
      * @return mixed
@@ -433,11 +438,27 @@ abstract class DBSearch
 	 */
 	abstract public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null);
 
-    /**
+	/**
+	 * Filter this search with another search.
+	 * Initial search is unmodified.
+	 * The difference with Intersect, is that an alias can be provided,
+	 * the filtered class does not need to be the first joined class,
+	 * it can be any class of the search.
+	 *
+	 * @param string $sClassAlias class being filtered
+	 * @param DBSearch $oFilter Filter to apply
+	 *
+	 * @return DBSearch The filtered search
+	 * @throws \CoreException
+	 */
+	abstract public function Filter($sClassAlias, DBSearch $oFilter);
+
+	/**
      * Filter the result
      *
      * The filter is performed by returning only the values in common with the given $oFilter
      * The impact on the resulting query performance/viability can be significant.
+     * Only the first joined class can be filtered.
      *
      * @internal
      *
@@ -456,7 +477,7 @@ abstract class DBSearch
      *
      * @param DBSearch   $oFilter        The join is performed against $oFilter selected class
      * @param integer    $iDirection     can be either DBSearch::JOIN_POINTING_TO or DBSearch::JOIN_REFERENCED_BY
-     * @param string     $sExtKeyAttCode The join is performed against $sExtKeyAttCode wetheir it is compared aginst the current DBSearch or $oFilter depend of $iDirection
+     * @param string     $sExtKeyAttCode The join is performed against $sExtKeyAttCode whether it is compared against the current DBSearch or $oFilter depend of $iDirection
      * @param integer    $iOperatorCode  See DBSearch::AddCondition_PointingTo()
      * @param array|null $aRealiasingMap Map of aliases from the attached query, that could have been renamed by the optimization process
      *
@@ -683,6 +704,15 @@ abstract class DBSearch
      */
     abstract public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false);
 
+    /**
+     * Export the DBSearch as a structure (array of arrays...) suitable for a conversion to JSON
+     *
+     * @internal
+     *
+     * @return mixed[string]
+     */
+    abstract public function ToJSON();
+
 	static protected $m_aOQLQueries = array();
 
     /**
@@ -718,12 +748,13 @@ abstract class DBSearch
      *
 	 * @param string $sQuery The OQL to convert to a DBSearch
 	 * @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
 	 */
-	static public function FromOQL($sQuery, $aParams = null)
+	static public function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
 	{
 		if (empty($sQuery))
 		{
@@ -765,7 +796,10 @@ abstract class DBSearch
 			$oOql = new OqlInterpreter($sQuery);
 			$oOqlQuery = $oOql->ParseQuery();
 	
-			$oMetaModel = new ModelReflectionRuntime();
+			if ($oMetaModel === null)
+			{
+				$oMetaModel = new ModelReflectionRuntime();
+			}
 			$oOqlQuery->Check($oMetaModel, $sQuery); // Exceptions thrown in case of issue
 	
 			$oResultFilter = $oOqlQuery->ToDBSearch($sQuery);
@@ -945,7 +979,9 @@ abstract class DBSearch
 			$bBeautifulSQL = self::$m_bTraceQueries || self::$m_bDebugQuery || self::$m_bIndentQueries;
 			$sRes = $oSQLQuery->RenderGroupBy($aScalarArgs, $bBeautifulSQL, $aOrderBy, $iLimitCount, $iLimitStart);
 		}
-		catch (Exception $e)
+		// Catch CoreException to add info before throwing again
+		// Other exceptions will be thrown directly
+		catch (CoreException $e)
 		{
 			// Add some information...
 			$e->addInfo('OQL', $this->ToOQL());
@@ -1055,6 +1091,39 @@ abstract class DBSearch
 		return $sRes;
 	}
 
+	/**
+	 * @param bool $bMustHaveOneResultMax if true will throw a CoreOqlMultipleResultsFound if multiple results
+	 * @param array $aOrderBy
+	 * @param array $aSearchParams
+	 *
+	 * @return null|\DBObject query result
+	 * @throws \CoreOqlMultipleResultsForbiddenException if multiple results found and parameter enforce the check
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 */
+	public function GetFirstResult($bMustHaveOneResultMax = true, $aOrderBy = array(), $aSearchParams = array())
+	{
+		$oSet = new DBObjectSet($this, array(), $aSearchParams, null, 2);
+		$oFirstResult = $oSet->Fetch();
+		if ($oFirstResult === null) // useless but here for readability ;)
+		{
+			return null;
+		}
+
+		if ($bMustHaveOneResultMax)
+		{
+			$oSecondResult = $oSet->Fetch();
+			if ($oSecondResult !== null)
+			{
+				throw new CoreOqlMultipleResultsForbiddenException(
+					'Search returned multiple results, this is forbidden. Query was: '.$this->ToOQL());
+			}
+		}
+
+		return $oFirstResult;
+	}
+
     /**
      * @internal
      * @return mixed
@@ -1067,27 +1136,28 @@ abstract class DBSearch
      */
 	protected abstract function SetDataFiltered();
 
-    /**
-     * @internal
-     *
-     * @param      $aOrderBy
-     * @param      $aArgs
-     * @param      $aAttToLoad
-     * @param      $aExtendedDataSpec
-     * @param      $iLimitCount
-     * @param      $iLimitStart
-     * @param      $bGetCount
-     * @param null $aGroupByExpr
-     * @param null $aSelectExpr
-     *
-     * @return mixed
-     */
+	/**
+	 * @param      $aOrderBy
+	 * @param      $aArgs
+	 * @param      $aAttToLoad
+	 * @param      $aExtendedDataSpec
+	 * @param      $iLimitCount
+	 * @param      $iLimitStart
+	 * @param      $bGetCount
+	 * @param null $aGroupByExpr
+	 * @param null $aSelectExpr
+	 *
+	 * @return SQLObjectQuery
+	 * @throws \CoreException
+	 * @internal
+	 *
+	 */
 	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
 		$oSearch = $this;
 		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered())
 		{
-			foreach ($this->GetSelectedClasses() as $sClass)
+			foreach ($this->GetSelectedClasses() as $sClassAlias => $sClass)
 			{
 				$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
 				if ($oVisibleObjects === false)
@@ -1098,7 +1168,7 @@ abstract class DBSearch
 				if (is_object($oVisibleObjects))
 				{
 					$oVisibleObjects->AllowAllData();
-					$oSearch = $this->Intersect($oVisibleObjects);
+					$oSearch = $this->Filter($sClassAlias, $oVisibleObjects);
 					/** @var DBSearch $oSearch */
 					$oSearch->SetDataFiltered();
 				}

core/dbunionsearch.class.php

@@ -258,6 +258,24 @@ class DBUnionSearch extends DBSearch
 		return $bRet;
 	}
 
+	public function RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation = array())
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation);
+		}
+	}
+
+	public function TranslateConditions($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->TranslateConditions($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+	}
+
+
+
 	public function IsAny()
 	{
 		$bIsAny = true;
@@ -383,6 +401,16 @@ class DBUnionSearch extends DBSearch
 		}
 	}
 
+	public function Filter($sClassAlias, DBSearch $oFilter)
+	{
+		$aSearches = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aSearches[] = $oSearch->Filter($sClassAlias, $oFilter);
+		}
+		return new DBUnionSearch($aSearches);
+	}
+
 	public function Intersect(DBSearch $oFilter)
 	{
 		$aSearches = array();
@@ -453,6 +481,20 @@ class DBUnionSearch extends DBSearch
 		return $sRet;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see DBSearch::ToJSON()
+	 */
+	public function ToJSON()
+	{
+		$sRet = array('unions' => array());
+		foreach ($this->aSearches as $oSearch)
+		{
+			$sRet['unions'][] = $oSearch->ToJSON();
+		}
+		return $sRet;
+	}
+
 	/**
 	 * Returns a new DBUnionSearch object where duplicates queries have been removed based on their OQLs
 	 *
@@ -652,6 +694,8 @@ class DBUnionSearch extends DBSearch
 		}
 	}
 
+
+
 	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
 	{
 		$sInParamName = $this->GenerateUniqueParamName();

core/dict.class.inc.php

@@ -192,7 +192,11 @@ class Dict
 	/**
 	 * Formats a localized string with numbered placeholders (%1$s...) for the additional arguments
 	 * See vsprintf for more information about the syntax of the placeholders
+	 *
+	 * @see \TemplateString to use placeholders
+	 *
 	 * @param string $sFormatCode
+	 *
 	 * @return string
 	 */
 	public static function Format($sFormatCode /*, ... arguments ....*/)

core/displayablegraph.class.inc.php

@@ -265,7 +265,7 @@ class DisplayableNode extends GraphNode
 	/**
 	 * Retrieves the list of neighbour nodes, in the given direction: 'up' or 'down'
 	 * @param bool $bDirectionDown
-	 * @return multitype:NULL
+	 * @return mixed|NULL
 	 */
 	protected function GetNextNodes($bDirectionDown = true)
 	{
@@ -1418,16 +1418,24 @@ class DisplayableGraph extends SimpleGraph
 		}
 		return $aContextDefs;
 	}
-	
+
 	/**
 	 * Display the graph inside the given page, with the "filter" drawer above it
+	 *
 	 * @param WebPage $oP
-	 * @param hash $aResults
+	 * @param array $aResults
 	 * @param string $sRelation
 	 * @param ApplicationContext $oAppContext
 	 * @param array $aExcludedObjects
+	 * @param string $sObjClass
+	 * @param int $iObjKey
+	 * @param string $sContextKey
+	 * @param array $aContextParams
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
 	 */
-	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects = array(), $sObjClass = null, $iObjKey = null, $sContextKey, $aContextParams = array())
+	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array())
 	{	
 		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
 		$aExcludedByClass = array();
@@ -1611,4 +1619,4 @@ EOF
 		);
 	}
 	
-}
+}

core/event.class.inc.php

@@ -1,29 +1,20 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * 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
  */
 
 class Event extends DBObject implements iDisplay
@@ -101,7 +92,7 @@ class Event extends DBObject implements iDisplay
 		//$this->DisplayBareHeader($oPage, $bEditMode);
 		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
 		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$oPage->SetCurrentTab('UI:PropertiesTab');
 		$this->DisplayBareProperties($oPage, $bEditMode);
 	}
 	

core/htmlsanitizer.class.inc.php

@@ -206,6 +206,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'q' => array(),
 		'hr' => array('style'),
 		'pre' => array(),
+		'center' => array(),
 	);
 
 	protected static $aAttrsWhiteList = array(
@@ -240,6 +241,8 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 
 	public function __construct()
 	{
+		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))
@@ -271,6 +274,8 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		// 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
 		
@@ -394,4 +399,4 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		}
 		return true;
 	}
-}
+}

core/iTopConfigParser.php

@@ -0,0 +1,120 @@
+<?php
+/**
+ * Created by Bruno DA SILVA, working for Combodo
+ * Date: 31/12/2019
+ * Time: 12:29
+ */
+
+use PhpParser\Node\Expr\Assign;
+use PhpParser\ParserFactory;
+use PhpParser\PrettyPrinter\Standard;
+
+class iTopConfigParser
+{
+
+	/** @var \PhpParser\Node[] */
+	private $aInitialNodes;
+
+	/** @var \PhpParser\Node[] */
+	private $aVisitedNodes;
+
+	/** @var string|null  */
+	private $oException = null;
+	/**
+	 * @var array
+	 */
+	private $aVarsMap;
+
+	/**
+	 * iTopConfigValidator constructor.
+	 *
+	 * @param $sConfig
+	 * @param \PhpParser\Parser|null $oParser
+	 *
+	 * @throws \Exception
+	 */
+	public function __construct($sConfig)
+	{
+		$oParser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+
+		$this->aVarsMap = array(
+			'MySettings' => array(),
+			'MyModuleSettings' => array(),
+			'MyModules' => array(),
+		);
+
+		if ($sConfig !== null)
+		{
+			$this->BrowseFile($oParser, $sConfig);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function GetVarsMap()
+	{
+		return $this->aVarsMap;
+	}
+
+	/**
+	 * @param $arrayName
+	 * @param $key
+	 *
+	 * @return array
+	 */
+	public function GetVarValue($arrayName, $key)
+	{
+		if (!array_key_exists($arrayName, $this->aVarsMap)){
+			return array('found' => false);
+		}
+		$arrayValue = $this->aVarsMap[$arrayName];
+		if (!array_key_exists($key, $arrayValue)){
+			return array('found' => false);
+		}
+		return array('found' => true,
+			'value' => $arrayValue[$key]);
+	}
+
+	/**
+	 * @param \PhpParser\Parser $oParser
+	 * @param $sConfig
+	 *
+	 * @return \Combodo\iTop\Config\Validator\ConfigNodesVisitor
+	 */
+	private function BrowseFile(\PhpParser\Parser $oParser, $sConfig)
+	{
+		$prettyPrinter = new Standard();
+
+		try
+		{
+			$aNodes = $oParser->parse($sConfig);
+		}
+		catch (\Error $e)
+		{
+			$sMessage = Dict::Format('config-parse-error', $e->getMessage(), $e->getLine());
+			$this->oException = new \Exception($sMessage, 0, $e);
+		}
+
+		foreach ($aNodes as $oAssignation)
+		{
+			if (! $oAssignation instanceof Assign)
+			{
+				continue;
+			}
+
+			$sCurrentRootVar = $oAssignation->var->name;
+			if (!array_key_exists($sCurrentRootVar, $this->aVarsMap))
+			{
+				continue;
+			}
+			$aCurrentRootVarMap =& $this->aVarsMap[$sCurrentRootVar];
+
+			foreach ($oAssignation->expr->items as $oItem)
+			{
+				$sValue = $prettyPrinter->prettyPrintExpr($oItem->value);
+				$aCurrentRootVarMap[$oItem->key->value] = $sValue;
+			}
+		}
+	}
+}

core/kpi.class.inc.php

@@ -356,11 +356,11 @@ class ExecutionKPI
 		}
 	}
 
-	const HtmlReportFile = 'log/kpi.html';
+	const HTML_REPORT_FILE = 'log/kpi.html';
 
 	static protected function Report($sText)
 	{
-		file_put_contents(APPROOT.self::HtmlReportFile, "$sText\n", FILE_APPEND | LOCK_EX);
+		file_put_contents(APPROOT.self::HTML_REPORT_FILE, "$sText\n", FILE_APPEND | LOCK_EX);
 	}
 
 	static protected function MemStr($iMemory)

core/legacy/dbobjectsearchlegacy.class.php

@@ -52,7 +52,12 @@ class DBObjectSearch extends DBSearch
 	protected $m_bAllowAllData = false;
 	protected $m_bDataFiltered = false;
 
-    /**
+	public function ToJSON()
+	{
+		return '{}';
+	}
+
+	/**
      * DBObjectSearch constructor.
      *
      * @api
@@ -291,6 +296,16 @@ class DBObjectSearch extends DBSearch
 		return $bFound;
 	}
 
+
+	public function RenameAliasesInNameSpace($aClassAliases, $aAliasTranslation = array())
+	{
+	}
+
+	public function TranslateConditions($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+	}
+
+
 	public function SetModifierProperty($sPluginClass, $sProperty, $value)
 	{
 		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
@@ -955,7 +970,7 @@ class DBObjectSearch extends DBSearch
 		$this->RecomputeClassList($this->m_aClasses);
 	}
 
-	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
+	protected function AddCondition_ReferencedBy_InNameSpace(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
 	{
 		$sForeignClass = $oFilter->GetClass();
 
@@ -982,10 +997,115 @@ class DBObjectSearch extends DBSearch
 		}
 	}
 
+	/**
+	 * Filter this search with another search.
+	 * Initial search is unmodified.
+	 * The difference with Intersect, is that an alias can be provided,
+	 * the filtered class does not need to be the first joined class.
+	 *
+	 * @param string $sClassAlias class being filtered
+	 * @param DBSearch $oFilter Filter to apply
+	 *
+	 * @return DBSearch The filtered search
+	 * @throws \CoreException
+	 */
+	public function Filter($sClassAlias, DBSearch $oFilter)
+	{
+		// If the conditions are the correct ones for Intersect
+		if (($this->GetFirstJoinedClassAlias() == $sClassAlias))
+		{
+			return $this->Intersect($oFilter);
+		}
+
+		/** @var \DBObjectSearch $oFilteredSearch */
+		$oFilteredSearch = $this->DeepClone();
+		$oFilterExpression = self::FilterSubClass($oFilteredSearch, $sClassAlias, $oFilter, $this->m_aClasses);
+		if ($oFilterExpression === false)
+		{
+			throw new CoreException("Limitation: cannot filter search");
+		}
+
+		$oFilteredSearch->AddConditionExpression($oFilterExpression);
+
+		return $oFilteredSearch;
+	}
+
+	/**
+	 * Filter "in place" the search (filtered part is replaced in the initial search)
+	 *
+	 * @param DBObjectSearch $oSearch Search to filter, modified with the given filter
+	 * @param string $sClassAlias class to filter
+	 * @param \DBSearch $oFilter Filter to apply
+	 *
+	 * @return \Expression|false
+	 * @throws \CoreException
+	 */
+	private static function FilterSubClass(DBObjectSearch &$oSearch, $sClassAlias, DBSearch $oFilter, $aRootClasses)
+	{
+		if (($oSearch->GetFirstJoinedClassAlias() == $sClassAlias))
+		{
+			$oSearch->ResetCondition();
+			$oSearch = $oSearch->IntersectSubClass($oFilter, $aRootClasses);
+			return $oSearch->GetCriteria();
+		}
+
+		/** @var Expression $oFilterExpression */
+		// Search in the filter tree where is the correct DBSearch
+		foreach ($oSearch->m_aPointingTo as $sExtKey => $aPointingTo)
+		{
+			foreach ($aPointingTo as $iOperatorCode => $aFilters)
+			{
+				foreach ($aFilters as $index => $oExtFilter)
+				{
+					$oFilterExpression = self::FilterSubClass($oExtFilter, $sClassAlias, $oFilter, $aRootClasses);
+					if ($oFilterExpression !== false)
+					{
+						$oSearch->m_aPointingTo[$sExtKey][$iOperatorCode][$index] = $oExtFilter;
+						return $oFilterExpression;
+					}
+				}
+			}
+		}
+
+		foreach($oSearch->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $index => $oForeignFilter)
+					{
+						$oFilterExpression = self::FilterSubClass($oForeignFilter, $sClassAlias, $oFilter, $aRootClasses);
+						if ($oFilterExpression !== false)
+						{
+							$oSearch->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode][$index] = $oForeignFilter;
+							return $oFilterExpression;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+	
 	/**
 	 * @inheritDoc
+	 * @throws \CoreException
 	 */
 	public function Intersect(DBSearch $oFilter)
+	{
+		return $this->IntersectSubClass($oFilter, $this->m_aClasses);
+	}
+
+	/**
+	 * @param \DBSearch $oFilter
+	 * @param array $aRootClasses classes of the root search (for aliases)
+	 *
+	 * @return \DBUnionSearch|mixed
+	 * @throws \CoreException
+	 */
+	protected function IntersectSubClass(DBSearch $oFilter, $aRootClasses)
 	{
 		if ($oFilter instanceof DBUnionSearch)
 		{
@@ -1001,15 +1121,12 @@ class DBObjectSearch extends DBSearch
 		foreach ($aFilters as $oRightFilter)
 		{
 			// Limitation: the queried class must be the first declared class
-			if ($this->GetFirstJoinedClassAlias() != $this->GetClassAlias())
-			{
-				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$this->GetClass()} AS {$this->GetClassAlias()}) is not the first joined class ({$this->GetFirstJoinedClass()} AS {$this->GetFirstJoinedClassAlias()})");
-			}
 			if ($oRightFilter->GetFirstJoinedClassAlias() != $oRightFilter->GetClassAlias())
 			{
 				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$oRightFilter->GetClass()} AS {$oRightFilter->GetClassAlias()}) is not the first joined class ({$oRightFilter->GetFirstJoinedClass()} AS {$oRightFilter->GetFirstJoinedClassAlias()})");
 			}
 
+			/** @var \DBObjectSearch $oLeftFilter */
 			$oLeftFilter = $this->DeepClone();
 			$oRightFilter = $oRightFilter->DeepClone();
 
@@ -1019,14 +1136,14 @@ class DBObjectSearch extends DBSearch
 				$oLeftFilter->AllowAllData();
 			}
 
-			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
+			if ($oLeftFilter->GetFirstJoinedClass() != $oRightFilter->GetClass())
 			{
-				if (MetaModel::IsParentClass($oLeftFilter->GetClass(), $oRightFilter->GetClass()))
+				if (MetaModel::IsParentClass($oLeftFilter->GetFirstJoinedClass(), $oRightFilter->GetClass()))
 				{
 					// Specialize $oLeftFilter
-					$oLeftFilter->ChangeClass($oRightFilter->GetClass());
+					$oLeftFilter->ChangeClass($oRightFilter->GetClass(), $oLeftFilter->GetFirstJoinedClassAlias());
 				}
-				elseif (MetaModel::IsParentClass($oRightFilter->GetClass(), $oLeftFilter->GetClass()))
+				elseif (MetaModel::IsParentClass($oRightFilter->GetFirstJoinedClass(), $oLeftFilter->GetClass()))
 				{
 					// Specialize $oRightFilter
 					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
@@ -1038,7 +1155,7 @@ class DBObjectSearch extends DBSearch
 			}
 
 			$aAliasTranslation = array();
-			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oLeftFilter->m_aClasses, $aAliasTranslation);
+			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $aRootClasses, $aAliasTranslation);
 			$oLeftFilter->TransferConditionExpression($oRightFilter, $aAliasTranslation);
 			$aSearches[] = $oLeftFilter;
 		}
@@ -2465,4 +2582,6 @@ class DBObjectSearch extends DBSearch
 		}
 		return $oExpression;
 	}
+
+
 }

core/log.class.inc.php

@@ -119,7 +119,7 @@ class LogFileNameBuilderFactory
 	{
 		$oConfig = utils::GetConfig();
 		$sFileNameBuilderImpl = $oConfig->Get('log_filename_builder_impl');
-		if (empty($sFileNameBuilderImpl))
+		if (empty($sFileNameBuilderImpl) || !class_exists($sFileNameBuilderImpl))
 		{
 			$sFileNameBuilderImpl = 'DefaultLogFileNameBuilder';
 		}
@@ -153,28 +153,88 @@ class FileLog
 		$this->oFileNameBuilder = LogFileNameBuilderFactory::GetInstance($sFileName);
 	}
 
-	public function Error($sText)
+	/**
+	 * Since 2.7.0 with the 'log_filename_builder_impl' param the logs will output to different files name
+	 * As now by default iTop will use {@link WeeklyRotatingLogFileNameBuilder} (rotation each week), to avoid confusion, we're renaming
+	 * the legacy error.log / setup.log.
+	 *
+	 * @since 2.7.0 N°2518
+	 * @uses utils::GetConfig() the config must be persisted !
+	 */
+	public static function RenameLegacyLogFiles()
 	{
-		$this->Write('Error | '.$sText);
+		$oConfig = utils::GetConfig();
+		IssueLog::Enable(APPROOT.'log/error.log'); // refresh log file used
+		$sLogFileNameParam = $oConfig->Get('log_filename_builder_impl');
+		$aConfigValuesNoRotation = array('', 'DefaultLogFileNameBuilder');
+
+		$bIsLogRotationActivated = (!in_array($sLogFileNameParam, $aConfigValuesNoRotation, true));
+		if (!$bIsLogRotationActivated)
+		{
+			return;
+		}
+
+		IssueLog::Warning("Log name builder set to '$sLogFileNameParam', renaming legacy log files");
+		$aLogFilesToRename = array(
+			'log/setup.log' => 'log/setup.LEGACY.log',
+			'log/error.log' => 'log/error.LEGACY.log',
+		);
+		foreach ($aLogFilesToRename as $sLogCurrentName => $sLogNewName)
+		{
+			$sSource = APPROOT.$sLogCurrentName;
+			if (!file_exists($sSource))
+			{
+				IssueLog::Debug("Log file '$sLogCurrentName' (legacy) does not exists, renaming skipped");
+				continue;
+			}
+
+			$sDestination = APPROOT.$sLogNewName;
+			$bResult = rename($sSource, $sDestination);
+			if (!$bResult)
+			{
+				IssueLog::Error("Log file '$sLogCurrentName' (legacy) cannot be renamed to '$sLogNewName'");
+				continue;
+			}
+			IssueLog::Info("Log file '$sLogCurrentName' (legacy) renamed to '$sLogNewName'");
+		}
 	}
 
-	public function Warning($sText)
+	public function Error($sText, $sChannel = '', $aContext = array())
 	{
-		$this->Write('Warning | '.$sText);
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
 	}
 
-	public function Info($sText)
+	public function Warning($sText, $sChannel = '', $aContext = array())
 	{
-		$this->Write('Info | '.$sText);
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
 	}
 
-	public function Ok($sText)
+	public function Info($sText, $sChannel = '', $aContext = array())
 	{
-		$this->Write('Ok | '.$sText);
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
 	}
 
-	protected function Write($sText)
+	public function Ok($sText, $sChannel = '', $aContext = array())
 	{
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
+	}
+
+	public function Debug($sText, $sChannel = '', $aContext = array())
+	{
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
+	}
+
+	public function Trace($sText, $sChannel = '', $aContext = array())
+	{
+		$this->Write($sText, __FUNCTION__, $sChannel, $aContext);
+	}
+
+
+	protected function Write($sText, $sLevel = '', $sChannel = '', $aContext = array())
+	{
+		$sTextPrefix = empty($sLevel) ? '' : (str_pad($sLevel, 7).' | ');
+		$sTextSuffix = empty($sChannel) ? '' : " | $sChannel";
+		$sText = "{$sTextPrefix}{$sText}{$sTextSuffix}";
 		$sLogFilePath = $this->oFileNameBuilder->GetLogFilePath();
 
 		if (empty($sLogFilePath))
@@ -187,7 +247,15 @@ class FileLog
 		{
 			flock($hLogFile, LOCK_EX);
 			$sDate = date('Y-m-d H:i:s');
-			fwrite($hLogFile, "$sDate | $sText\n");
+			if (empty($aContext))
+			{
+				fwrite($hLogFile, "$sDate | $sText\n");
+			}
+			else
+			{
+				$sContext = var_export($aContext, true);
+				fwrite($hLogFile, "$sDate | $sText\n$sContext\n");
+			}
 			fflush($hLogFile);
 			flock($hLogFile, LOCK_UN);
 			fclose($hLogFile);
@@ -197,53 +265,165 @@ class FileLog
 
 abstract class LogAPI
 {
+	const CHANNEL_DEFAULT   = '';
+
+	const LEVEL_ERROR       = 'Error';
+	const LEVEL_WARNING     = 'Warning';
+	const LEVEL_INFO        = 'Info';
+	const LEVEL_OK          = 'Ok';
+	const LEVEL_DEBUG       = 'Debug';
+	const LEVEL_TRACE       = 'Trace';
+
+	protected static $aLevelsPriority = array(
+		self::LEVEL_ERROR   => 400,
+		self::LEVEL_WARNING => 300,
+		self::LEVEL_INFO    => 200,
+		self::LEVEL_OK      => 200,
+		self::LEVEL_DEBUG   => 100,
+		self::LEVEL_TRACE   =>  50,
+	);
+
+	protected static $m_oMockMetaModelConfig = null;
+
 	public static function Enable($sTargetFile)
 	{
 		// m_oFileLog is not defined as a class attribute so that each impl will have its own
 		static::$m_oFileLog = new FileLog($sTargetFile);
 	}
 
-	public static function Error($sText)
+	public static function MockStaticObjects($oFileLog, $oMetaModelConfig=null)
 	{
-		if (static::$m_oFileLog)
-		{
-			static::$m_oFileLog->Error($sText);
-		}
+		static::$m_oFileLog = $oFileLog;
+		static::$m_oMockMetaModelConfig = $oMetaModelConfig;
 	}
-	public static function Warning($sText)
+
+	public static function Error($sMessage, $sChannel = null, $aContext = array())
 	{
-		if (static::$m_oFileLog)
-		{
-			static::$m_oFileLog->Warning($sText);
-		}
+		static::Log(self::LEVEL_ERROR, $sMessage, $sChannel, $aContext);
 	}
-	public static function Info($sText)
+
+	public static function Warning($sMessage, $sChannel = null, $aContext = array())
 	{
-		if (static::$m_oFileLog)
-		{
-			static::$m_oFileLog->Info($sText);
-		}
+		static::Log(self::LEVEL_WARNING, $sMessage, $sChannel, $aContext);
 	}
-	public static function Ok($sText)
+
+	public static function Info($sMessage, $sChannel = null, $aContext = array())
 	{
-		if (static::$m_oFileLog)
-		{
-			static::$m_oFileLog->Ok($sText);
-		}
+		static::Log(self::LEVEL_INFO, $sMessage, $sChannel, $aContext);
 	}
+
+	public static function Ok($sMessage, $sChannel = null, $aContext = array())
+	{
+		static::Log(self::LEVEL_OK, $sMessage, $sChannel, $aContext);
+	}
+
+	public static function Debug($sMessage, $sChannel = null, $aContext = array())
+	{
+		static::Log(self::LEVEL_DEBUG, $sMessage, $sChannel, $aContext);
+	}
+
+	public static function Trace($sMessage, $sChannel = null, $aContext = array())
+	{
+		static::Log(self::LEVEL_TRACE, $sMessage, $sChannel, $aContext);
+	}
+
+	public static function Log($sLevel, $sMessage, $sChannel = null, $aContext = array())
+	{
+		if (! static::$m_oFileLog)
+		{
+			return;
+		}
+
+		if (! isset(self::$aLevelsPriority[$sLevel]))
+		{
+			IssueLog::Error("invalid log level '{$sLevel}'");
+			return;
+		}
+
+		if (is_null($sChannel))
+		{
+			$sChannel = static::CHANNEL_DEFAULT;
+		}
+
+		$sMinLogLevel = self::GetMinLogLevel($sChannel);
+
+		if ($sMinLogLevel === false || $sMinLogLevel === 'false')
+		{
+			return;
+		}
+		if (is_string($sMinLogLevel))
+		{
+			if (! isset(self::$aLevelsPriority[$sMinLogLevel]))
+			{
+				throw new Exception("invalid configuration for log_level '{$sMinLogLevel}' is not within the list: ".implode(',', array_keys(self::$aLevelsPriority)));
+			}
+			elseif (self::$aLevelsPriority[$sLevel] < self::$aLevelsPriority[$sMinLogLevel])
+			{
+				//priority too low regarding the conf, do not log this
+				return;
+			}
+		}
+
+		static::$m_oFileLog->$sLevel($sMessage, $sChannel, $aContext);
+	}
+
+	/**
+	 * @param $sChannel
+	 *
+	 * @return mixed|null
+	 */
+	private static function GetMinLogLevel($sChannel)
+	{
+		$oConfig = (static::$m_oMockMetaModelConfig !== null) ? static::$m_oMockMetaModelConfig :  \MetaModel::GetConfig();
+		if (!$oConfig instanceof Config)
+		{
+			return self::LEVEL_OK;
+		}
+
+		$sLogLevelMin = $oConfig->Get('log_level_min');
+
+		if (empty($sLogLevelMin))
+		{
+			return self::LEVEL_OK;
+		}
+
+		if (!is_array($sLogLevelMin))
+		{
+			return $sLogLevelMin;
+		}
+
+		if (isset($sLogLevelMin[$sChannel]))
+		{
+			return $sLogLevelMin[$sChannel];
+		}
+
+		if (isset($sLogLevelMin[static::CHANNEL_DEFAULT]))
+		{
+			return $sLogLevelMin[$sChannel];
+		}
+
+		return self::LEVEL_OK;
+	}
+
 }
 
 class SetupLog extends LogAPI
 {
+	const CHANNEL_DEFAULT = 'SetupLog';
+
 	protected static $m_oFileLog = null;
 }
 
 class IssueLog extends LogAPI
 {
+	const CHANNEL_DEFAULT = 'IssueLog';
+
 	protected static $m_oFileLog = null;
 }
 
 class ToolsLog extends LogAPI
 {
+	const CHANNEL_DEFAULT = 'ToolsLog';
+
 	protected static $m_oFileLog = null;
 }

core/metamodel.class.php

@@ -27,7 +27,7 @@ require_once APPROOT.'core/expressioncache.class.inc.php';
 
 
 /**
- * We need to have all iLoginFSMExtension/iLoginDataExtension impl loaded ! Cannot use autoloader...
+ * We need to have all iLoginFSMExtension/iLoginUIExtension impl loaded ! Cannot use autoloader...
  */
 require_once APPROOT.'application/loginform.class.inc.php';
 require_once APPROOT.'application/loginbasic.class.inc.php';
@@ -2794,7 +2794,7 @@ abstract class MetaModel
 
 		// Build the list of available extensions
 		//
-		$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginDataExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
+		$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginUIExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider', 'iModuleExtension');
 		foreach($aInterfaces as $sInterface)
 		{
 			self::$m_aExtensionClasses[$sInterface] = array();
@@ -5087,7 +5087,7 @@ abstract class MetaModel
 	}
 
 	/**
-	 * Determines wether the target DB is frozen or not
+	 * Determines whether the target DB is frozen or not
 	 *
 	 * @return bool
 	 */
@@ -5514,10 +5514,10 @@ abstract class MetaModel
 						//
 						$bToBeChanged = false;
 						$sActualFieldSpec = CMDBSource::GetFieldSpec($sTable, $sField);
-						if (strcasecmp($sDBFieldSpec, $sActualFieldSpec) != 0)
+						if (!CMDBSource::IsSameFieldTypes($sDBFieldSpec, $sActualFieldSpec))
 						{
 							$bToBeChanged = true;
-							$aErrors[$sClass][$sAttCode][] = "field '$sField' in table '$sTable' has a wrong type: found '$sActualFieldSpec' while expecting '$sDBFieldSpec'";
+							$aErrors[$sClass][$sAttCode][] = "field '$sField' in table '$sTable' has a wrong type: found <code>$sActualFieldSpec</code> while expecting <code>$sDBFieldSpec</code>";
 						}
 						if ($bToBeChanged)
 						{
@@ -6324,6 +6324,11 @@ abstract class MetaModel
 		//         classes have to be derived from cmdbabstract (to be editable in the UI)
 		require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
 
+		if (!defined('MODULESROOT'))
+		{
+			define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
+		}
+
 		require_once(APPROOT.'core/autoload.php');
 		require_once(APPROOT.'env-'.self::$m_sEnvironment.'/autoload.php');
 
@@ -6685,6 +6690,10 @@ abstract class MetaModel
 		else
 		{
 			// do the job for the real target class
+			if (!class_exists($aRow[$sClassAlias."finalclass"]))
+			{
+				throw new CoreException("Class {$aRow[$sClassAlias."finalclass"]} derived from $sClass does not exist anymore, please remove corresponding tables in the database", array('row' => $aRow));
+			}
 			$sClass = $aRow[$sClassAlias."finalclass"];
 		}
 		return new $sClass($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
@@ -6935,6 +6944,8 @@ abstract class MetaModel
 	}
 
 	/**
+	 * @deprecated 2.7.0 N°1627, use ItopCounter::incRootClass($sClass) instead
+	 *
 	 * @param string $sClass
 	 *
 	 * @return int
@@ -6942,10 +6953,7 @@ abstract class MetaModel
 	 */
 	public static function GetNextKey($sClass)
 	{
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		$sRootTable = MetaModel::DBGetTable($sRootClass);
-
-		return CMDBSource::GetNextInsertId($sRootTable);
+		return ItopCounter::IncClass($sClass);
 	}
 
 	/**
@@ -7073,7 +7081,7 @@ abstract class MetaModel
 
 		if ($bSkipLinkingClasses)
 		{
-			$aLinksClasses = self::EnumLinksClasses();
+			$aLinksClasses = array_keys(self::GetLinkClasses());
 		}
 
 		// 1-N links (referencing my class), array of sClass => array of sAttcode
@@ -7111,12 +7119,12 @@ abstract class MetaModel
 	}
 
 	/**
-	 * @deprecated It is not recommended to use this function: call {@link MetaModel::GetLinkClasses} instead !
+	 * @deprecated 2.5.0 It is not recommended to use this function: call {@link MetaModel::GetLinkClasses} instead !
 	 * The only difference with EnumLinkingClasses is the output format
 	 *
+	 * @see MetaModel::GetLinkClasses
 	 * @return string[] classes having at least two external keys (thus too many classes as compared to GetLinkClasses)
 	 *
-	 * @see MetaModel::GetLinkClasses
 	 */
 	public static function EnumLinksClasses()
 	{
@@ -7145,15 +7153,16 @@ abstract class MetaModel
 	}
 
 	/**
-	 * @deprecated It is not recommended to use this function: call {@link MetaModel::GetLinkClasses} instead !
+	 * @deprecated 2.5.0 It is not recommended to use this function: call {@link MetaModel::GetLinkClasses} instead !
 	 * The only difference with EnumLinksClasses is the output format
 	 *
-	 * @param string $sClass
+	 * @see MetaModel::GetLinkClasses
+	 *
+	 *@param string $sClass
 	 *
 	 * @return string[] classes having at least two external keys (thus too many classes as compared to GetLinkClasses)
 	 * @throws \CoreException
 	 *
-	 * @see MetaModel::GetLinkClasses
 	 */
 	public static function EnumLinkingClasses($sClass = "")
 	{
@@ -7195,14 +7204,14 @@ abstract class MetaModel
 	}
 
 	/**
-	 * This function has two siblings that will be soon deprecated:
-	 * {@link MetaModel::EnumLinkingClasses} and {@link MetaModel::EnumLinkClasses}
-	 *
 	 * Using GetLinkClasses is the recommended way to determine if a class is
 	 * actually an N-N relation because it is based on the decision made by the
 	 * designer the data model
 	 *
-	 * @return array external key code => target class
+	 * This function has two siblings that will be soon deprecated:
+	 * {@link MetaModel::EnumLinkingClasses} and {@link MetaModel::EnumLinkClasses}
+	 *
+	 * @return array (target class => (external key code => target class))
 	 * @throws \CoreException
 	 */
 	public static function GetLinkClasses()
@@ -7341,19 +7350,31 @@ abstract class MetaModel
 
 	/**
 	 * @param string $sInterface
+	 * @param string|null $sFilterInstanceOf [optional] if given, only instance of this string will be returned
 	 *
 	 * @return array classes=>instance implementing the given interface
 	 */
-	public static function EnumPlugins($sInterface)
+	public static function EnumPlugins($sInterface, $sFilterInstanceOf = null)
 	{
-		if (array_key_exists($sInterface, self::$m_aExtensionClasses))
-		{
-			return self::$m_aExtensionClasses[$sInterface];
-		}
-		else
+		if (!array_key_exists($sInterface, self::$m_aExtensionClasses))
 		{
 			return array();
 		}
+
+		if (is_null($sFilterInstanceOf))
+		{
+			return self::$m_aExtensionClasses[$sInterface];
+		}
+
+		$fFilterCallback = function ($instance) use ($sFilterInstanceOf)
+		{
+			return $instance instanceof $sFilterInstanceOf;
+		};
+
+		return array_filter(
+			self::$m_aExtensionClasses[$sInterface],
+			$fFilterCallback
+		);
 	}
 
 	/**
@@ -7511,9 +7532,12 @@ abstract class MetaModel
 			$sKey = self::DBGetKey($sClass);
 			$sRootKey = self::DBGetKey($sRootClass);
 			$sRootField = self::DBGetClassField($sRootClass);
-			// Copy the finalclass of the root table
-			$sRequest = "UPDATE `$sTable`,`$sRootTable` SET  `$sTable`.`$sField` = `$sRootTable`.`$sRootField` WHERE `$sTable`.`$sKey` = `$sRootTable`.`$sRootKey`";
-			$aRequests[] = $sRequest;
+			if ($sTable != $sRootTable)
+			{
+				// Copy the finalclass of the root table
+				$sRequest = "UPDATE `$sTable`,`$sRootTable` SET  `$sTable`.`$sField` = `$sRootTable`.`$sRootField` WHERE `$sTable`.`$sKey` = `$sRootTable`.`$sRootKey`";
+				$aRequests[] = $sRequest;
+			}
 		}
 
 		return $aRequests;

core/mutex.class.inc.php

@@ -88,6 +88,25 @@ class iTopMutex
 		$this->InitMySQLSession();
 	}
 
+	/**
+	 * Get instance of self but with an escaped $sName
+	 *
+	 * this is meant to be used with non trusted string such as user inputs.
+	 *
+	 * @param mixed ...$aArgs smae as __construct()
+	 *
+	 * @return \iTopMutex
+	 * @since 2.7.0
+	 *
+	 */
+	public static function GetInstanceFromUserInput(...$aArgs)
+	{
+		$aArgs[0] = \CMDBSource::Quote($aArgs[0]);
+
+		return new iTopMutex(...$aArgs);
+	}
+
+
 	public function __destruct()
 	{
 		if ($this->bLocked)

core/oql/expression.class.inc.php

@@ -27,6 +27,17 @@ class MissingQueryArgument extends CoreException
  */
 abstract class Expression
 {
+	const OPERATOR_BINARY = 'binary';
+	const OPERATOR_BOOLEAN = 'boolean_binary';
+	const OPERATOR_FIELD = 'field';
+	const OPERATOR_FUNCTION = 'function';
+	const OPERATOR_INTERVAL = 'interval';
+	const OPERATOR_LIST = 'list';
+	const OPERATOR_SCALAR = 'scalar';
+	const OPERATOR_UNARY = 'unary';
+	const OPERATOR_VARIABLE = 'variable';
+
+
 	/**
 	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
 	 **/
@@ -99,13 +110,23 @@ abstract class Expression
 	abstract public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false);
 
 	/**
-	 * @param DBObjectSearch $oSearch
+	 * Recursively renders the expression as a structure (array) suitable for a JSON export
+	 *
+	 * @param mixed[string] $aArgs
+	 * @param boolean $bRetrofitParams
+	 * @return mixed[string]
+	 */
+	abstract public function ToJSON(&$aArgs = null, $bRetrofitParams = false);
+
+	/**
+	 * @param DBSearch $oSearch
 	 * @param array $aArgs
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @param array $aCtx
 	 *
 	 * @return array parameters for the search form
+	 * @throws \MissingQueryArgument
 	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
@@ -145,6 +166,10 @@ abstract class Expression
 		return true;
 	}
 
+	/**
+	 * @return string
+	 * @throws \MissingQueryArgument
+	 */
 	public function serialize()
 	{
 		return base64_encode($this->RenderExpression(false));
@@ -163,7 +188,9 @@ abstract class Expression
 
 	/**
 	 * @param $sConditionExpr
+	 *
 	 * @return Expression
+	 * @throws \OQLException
 	 */
 	static public function FromOQL($sConditionExpr)
 	{
@@ -181,13 +208,14 @@ abstract class Expression
 
 	static public function FromSQL($sSQL)
 	{
-		$oSql = new SQLExpression($sSQL);
-		return $oSql;
+		return new SQLExpression($sSQL);
 	}
 
 	/**
 	 * @param Expression $oExpr
+	 *
 	 * @return Expression
+	 * @throws \CoreException
 	 */
 	public function LogAnd(Expression $oExpr)
 	{
@@ -198,7 +226,9 @@ abstract class Expression
 
 	/**
 	 * @param Expression $oExpr
+	 *
 	 * @return Expression
+	 * @throws \CoreException
 	 */
 	public function LogOr(Expression $oExpr)
 	{
@@ -222,6 +252,15 @@ abstract class Expression
 		return $sDefault;
 	}
 
+	/**
+	 * @param $oSearch
+	 * @param array $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param \AttributeDefinition $oAttDef
+	 *
+	 * @return array
+	 * @throws \MissingQueryArgument
+	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		return array(
@@ -277,6 +316,12 @@ class SQLExpression extends Expression
 		return $this->m_sSQL;
 	}
 
+	// recursive rendering
+	public function toJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return  null; // TODO should we throw an Exception ??
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -369,7 +414,7 @@ class BinaryExpression extends Expression
 		{
 			throw new CoreException('Expecting an Expression object on the right hand', array('found_class' => get_class($oRightExpr)));
 		}
-		if ((($sOperator == "IN") || ($sOperator == "NOT IN")) && !($oRightExpr instanceof ListExpression))
+		if ((($sOperator == "IN") || ($sOperator == "NOT IN")) && !($oRightExpr instanceof ListExpression || $oRightExpr instanceof NestedQueryExpression))
 		{
 			throw new CoreException("Expecting a List Expression object on the right hand for operator $sOperator",
 				array('found_class' => get_class($oRightExpr)));
@@ -413,6 +458,32 @@ class BinaryExpression extends Expression
 		return "($sLeft $sOperator $sRight)";
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @throws \MissingQueryArgument
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		if (($this->GetOperator() == 'AND') || ($this->GetOperator() == 'OR'))
+		{
+			return array(
+				'type' => static::OPERATOR_BOOLEAN,
+				'operator' =>  $this->GetOperator(),
+				'left' =>  $this->GetLeftExpr()->ToJSON($aArgs, $bRetrofitParams),
+				'right' => $this->GetRightExpr()->ToJSON($aArgs, $bRetrofitParams),
+				'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+			);
+		}
+		return array(
+			'type' => static::OPERATOR_BINARY,
+			'operator' =>  $this->GetOperator(),
+			'left' =>  $this->GetLeftExpr()->ToJSON($aArgs, $bRetrofitParams),
+			'right' => $this->GetRightExpr()->ToJSON($aArgs, $bRetrofitParams),
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -420,6 +491,12 @@ class BinaryExpression extends Expression
 		$this->m_oRightExpr->Browse($callback);
 	}
 
+	/**
+	 * @param $aArgs
+	 *
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 */
 	public function ApplyParameters($aArgs)
 	{
 		if ($this->m_oLeftExpr instanceof VariableExpression)
@@ -446,13 +523,21 @@ class BinaryExpression extends Expression
 		$this->GetRightExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
 	}
 
+	/**
+	 * @param array $aTranslationData
+	 * @param bool $bMatchAll
+	 * @param bool $bMarkFieldsAsResolved
+	 *
+	 * @return \BinaryExpression|\Expression
+	 * @throws \CoreException
+	 */
 	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
 	}
-
+	
 	public function ListRequiredFields()
 	{
 		$aLeft = $this->GetLeftExpr()->ListRequiredFields();
@@ -521,6 +606,18 @@ class BinaryExpression extends Expression
 	}
 
 	// recursive rendering
+
+	/**
+	 * @param \DBSearch $oSearch
+	 * @param null $aArgs
+	 * @param null $oAttDef
+	 * @param array $aCtx
+	 *
+	 * @return array|string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
 		$bReverseOperator = false;
@@ -601,6 +698,8 @@ class BinaryExpression extends Expression
 	 * @param null $oAttDef
 	 *
 	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
 	 * @throws \MissingQueryArgument
 	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
@@ -789,6 +888,20 @@ class UnaryExpression extends Expression
 		return CMDBSource::Quote($this->m_value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @throws \MissingQueryArgument
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return array(
+			'type' => static::OPERATOR_UNARY,
+			'value' => $this->m_value,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -835,6 +948,13 @@ class UnaryExpression extends Expression
 
 class ScalarExpression extends UnaryExpression
 {
+	/**
+	 * ScalarExpression constructor.
+	 *
+	 * @param $value
+	 *
+	 * @throws \CoreException
+	 */
 	public function __construct($value)
 	{
 		if (!is_scalar($value) && !is_null($value) && (!$value instanceof OqlHexValue))
@@ -909,11 +1029,38 @@ class ScalarExpression extends UnaryExpression
 		return $sRet;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return array(
+			'type' => static::OPERATOR_SCALAR,
+			'value' => $this->m_value,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
+	/**
+	 * @param $aArgs
+	 *
+	 * @return \ScalarExpression
+	 */
 	public function GetAsScalar($aArgs)
 	{
 		return clone $this;
 	}
 
+	/**
+	 * @param $oSearch
+	 * @param array $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param \AttributeDefinition $oAttDef
+	 *
+	 * @return array
+	 * @throws \MissingQueryArgument
+	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		$aCriterion = array();
@@ -1122,6 +1269,7 @@ class FieldExpression extends UnaryExpression
 	 * @return array|string
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
 	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
@@ -1157,6 +1305,28 @@ class FieldExpression extends UnaryExpression
 		return "`{$this->m_sParent}`.`{$this->m_sName}`";
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return array(
+			'type' => static::OPERATOR_FIELD,
+			'value' => $this->m_value,
+			'alias' => $this->m_sParent,
+			'field' => $this->m_sName,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
+	/**
+	 * @param array $aClasses
+	 *
+	 * @return \AttributeDefinition|\AttributeInteger|null
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public function GetAttDef($aClasses = array())
 	{
 		if (!empty($this->m_sParent))
@@ -1213,6 +1383,14 @@ class FieldExpression extends UnaryExpression
 		}
 	}
 
+	/**
+	 * @param array $aTranslationData
+	 * @param bool $bMatchAll
+	 * @param bool $bMarkFieldsAsResolved
+	 *
+	 * @return \Expression|\FieldExpression|\FieldExpressionResolved|mixed|\UnaryExpression
+	 * @throws \CoreException
+	 */
 	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		if (!array_key_exists($this->m_sParent, $aTranslationData))
@@ -1256,6 +1434,7 @@ class FieldExpression extends UnaryExpression
 	 *
 	 * @return string label
 	 * @throws \CoreException
+	 * @throws \Exception
 	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
@@ -1267,7 +1446,7 @@ class FieldExpression extends UnaryExpression
 
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		// Set a default value for the general case
-		$sRes = $oAttDef->GetAsHtml($sValue);
+		$sRes = null;
 
 		// Exceptions...
 		if ($oAttDef->IsExternalKey())
@@ -1293,6 +1472,10 @@ class FieldExpression extends UnaryExpression
 				$sRes = Dict::S('UI:UndefinedObject');
 			}
 		}
+		if(is_null($sRes))
+		{
+			$sRes = $oAttDef->GetAsHtml($sValue);
+		}
 		return $sRes;
 	}
 
@@ -1331,6 +1514,7 @@ class FieldExpression extends UnaryExpression
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array
+	 * @throws \CoreException
 	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
@@ -1439,6 +1623,16 @@ class VariableExpression extends UnaryExpression
 		return $this->m_sName;
 	}
 
+	/**
+	 * @param \DBSearch $oSearch
+	 * @param null $aArgs
+	 * @param null $oAttDef
+	 * @param array $aCtx
+	 *
+	 * @return array|mixed|string
+	 * @throws \MissingQueryArgument
+	 * @throws \Exception
+	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
 		$sValue = $this->m_value;
@@ -1486,7 +1680,8 @@ class VariableExpression extends UnaryExpression
 					$oObj = MetaModel::GetObject($sTarget, $sValue);
 
 					return $oObj->Get("friendlyname");
-				} catch (CoreException $e)
+				}
+				catch (CoreException $e)
 				{
 				}
 			}
@@ -1546,6 +1741,19 @@ class VariableExpression extends UnaryExpression
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return array(
+			'type' => static::OPERATOR_VARIABLE,
+			'value' => $this->m_value,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		if ($this->m_sName == $sOldName)
@@ -1554,6 +1762,14 @@ class VariableExpression extends UnaryExpression
 		}
 	}
 
+	/**
+	 * @param $aArgs
+	 *
+	 * @return \ListExpression|\ScalarExpression|null
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \Exception
+	 */
 	public function GetAsScalar($aArgs)
 	{
 		$oRet = null;
@@ -1613,6 +1829,12 @@ class ListExpression extends Expression
 		$this->m_aExpressions = $aExpressions;
 	}
 
+	/**
+	 * @param $aScalars
+	 *
+	 * @return \ListExpression
+	 * @throws \CoreException
+	 */
 	public static function FromScalars($aScalars)
 	{
 		$aExpressions = array();
@@ -1635,6 +1857,14 @@ class ListExpression extends Expression
 	}
 
 	// recursive rendering
+
+	/**
+	 * @param bool $bForSQL
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 *
+	 * @return array|string
+	 */
 	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
 	{
 		$aRes = array();
@@ -1645,6 +1875,24 @@ class ListExpression extends Expression
 		return '('.implode(', ', $aRes).')';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aFields = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aFields[] = $oExpr->ToJSON($aArgs, $bRetrofitParams);
+		}
+		return array(
+			'type' => static::OPERATOR_LIST,
+			'fields' => $aFields,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -1654,6 +1902,12 @@ class ListExpression extends Expression
 		}
 	}
 
+	/**
+	 * @param $aArgs
+	 *
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 */
 	public function ApplyParameters($aArgs)
 	{
 		foreach ($this->m_aExpressions as $idx => $oExpr)
@@ -1759,6 +2013,121 @@ class ListExpression extends Expression
 	}
 }
 
+class NestedQueryExpression extends Expression
+{
+	/** @var DBSearch */
+	protected $m_oNestedQuery;
+
+	/*$m_oNestedQuery is an DBSearch object*/
+	public function __construct($oNestedQuery)
+	{
+		$this->m_oNestedQuery = $oNestedQuery;
+	}
+
+	/**
+	 * @param OQLObjectQuery $oObjQuery
+	 *
+	 * @return \NestedQueryExpression
+	 */
+	public static function FromOQLObjectQuery($oObjQuery)
+	{
+		$oExpressions = $oObjQuery->ToDBSearch("");
+		return new NestedQueryExpression($oExpressions);
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+	public function GetNestedQuery()
+	{
+		return $this->m_oNestedQuery;
+	}
+
+	// recursive rendering
+	/**
+	 * @param bool $bForSQL
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 *
+	 * @return array|string
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 */
+	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	{
+		if ($bForSQL)
+		{
+			$aAttToLoad = array();
+			foreach ($this->m_oNestedQuery->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aAttToLoad[$sClassAlias] = array();
+			}
+			return  '('.$this->m_oNestedQuery->MakeSelectQuery(array(), $aArgs, $aAttToLoad).')';
+		}
+		else
+		{
+			return '('.$this->m_oNestedQuery->ToOQL(false, null, false).')';
+		}
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+	}
+
+	/**/
+	public function ApplyParameters($aArgs)
+	{
+		$this->m_oNestedQuery->ApplyParameters($aArgs);
+	}
+
+	/**/
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	/**/
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		// Check and prepare the select information
+		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll , $bMarkFieldsAsResolved );
+		return clone $this;
+	}
+
+	public function ListRequiredFields()
+	{
+		return array();
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+	}
+
+	public function ListConstantFields()
+	{
+		return $this->m_oNestedQuery->ListConstantFields();
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oNestedQuery->RenameParam($sOldName, $sNewName);
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$this->m_oNestedQuery->RenameAlias($sOldName, $sNewName);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return $this->m_oNestedQuery->ToJSON();
+	}
+}
 
 class FunctionExpression extends Expression
 {
@@ -1798,6 +2167,26 @@ class FunctionExpression extends Expression
 		return $this->m_sVerb.'('.implode(', ', $aRes).')';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aFields = array();
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$aFields[] = $oExpr->ToJSON($aArgs, $bRetrofitParams);
+		}
+
+		return array(
+			'type' => static::OPERATOR_FUNCTION,
+			'operator' => $this->m_sVerb,
+			'fields' => $aFields,
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -2093,6 +2482,20 @@ class IntervalExpression extends Expression
 		return 'INTERVAL '.$this->m_oValue->RenderExpression($bForSQL, $aArgs, $bRetrofitParams).' '.$this->m_sUnit;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return array(
+			'type' => static::OPERATOR_INTERVAL,
+			'unit' => $this->m_sUnit,
+			'expression' => $this->m_oValue->ToJSON($aArgs, $bRetrofitParams),
+			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);
@@ -2192,6 +2595,25 @@ class CharConcatExpression extends Expression
 		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see Expression::ToJSON()
+	 */
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aFields = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aFields[] = $oExpr->RenderExpression($aArgs, $bRetrofitParams);
+		}
+
+		return array(
+			'type' => static::OPERATOR_FUNCTION,
+			'operator' => 'concat',
+			'fields' => $aFields,
+		);
+	}
+
 	public function Browse(Closure $callback)
 	{
 		$callback($this);

core/oql/oql-lexer.php

@@ -179,6 +179,7 @@ class OQLLexerRaw
                 '/\G(0x[0-9a-fA-F]+)/ ',
                 '/\G([0-9]+)/ ',
                 '/\G\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/ ',
+                '/\GNULL/ ',
                 '/\G([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/ ',
                 '/\G:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/ ',
                 '/\G\\./ ',
@@ -637,14 +638,19 @@ class OQLLexerRaw
     function yy_r1_72($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NAME;
+    $this->token = OQLParser::NULL_VAL;
     }
     function yy_r1_73($yy_subpatterns)
     {
 
-	$this->token = OQLParser::VARNAME;
+	$this->token = OQLParser::NAME;
     }
     function yy_r1_74($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::VARNAME;
+    }
+    function yy_r1_75($yy_subpatterns)
     {
 
 	$this->token = OQLParser::DOT;

core/oql/oql-lexer.plex

@@ -148,6 +148,7 @@ above            = "ABOVE"
 above_strict     = "ABOVE STRICT"
 not_above        = "NOT ABOVE"
 not_above_strict = "NOT ABOVE STRICT"
+null_val = "NULL"
 //
 // WARNING: there seems to be a bug in the Lexer about matching the longest pattern
 //          when there are alternates in the regexp.
@@ -391,6 +392,9 @@ numval {
 strval {
 	$this->token = OQLParser::STRVAL;
 }
+null_val {
+    $this->token = OQLParser::NULL_VAL;
+}
 name {
 	$this->token = OQLParser::NAME;
 }

core/oql/oql-parser.y

@@ -125,10 +125,16 @@ expression_prio3(A) ::= expression_prio3(X) operator3(Y) expression_prio2(Z). {
 expression_prio4(A) ::= expression_prio3(X). { A = X; }
 expression_prio4(A) ::= expression_prio4(X) operator4(Y) expression_prio3(Z). { A = new BinaryOqlExpression(X, Y, Z); }
 
-
 list(A) ::= PAR_OPEN list_items(X) PAR_CLOSE. {
 	A = new ListOqlExpression(X);
 }
+list(A) ::= PAR_OPEN query(X) PAR_CLOSE. {
+	A = new NestedQueryOqlExpression(X);
+}
+list(A) ::= PAR_OPEN union(X) PAR_CLOSE. {
+	A = new NestedQueryOqlExpression(X);
+}
+
 list_items(A) ::= expression_prio4(X). {
 	A = array(X);
 }
@@ -159,9 +165,11 @@ interval_unit(A) ::= F_YEAR(X). { A = X; }
 
 scalar(A) ::= num_scalar(X). { A = X; }
 scalar(A) ::= str_scalar(X). { A = X; }
+scalar(A) ::= null_scalar(X). { A = X; }
 
 num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); }
 str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); }
+null_scalar(A) ::= NULL_VAL. { A = new ScalarOqlExpression(null); }
 
 field_id(A) ::= name(X). { A = new FieldOqlExpression(X); }
 field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); }

core/oql/oqlquery.class.inc.php

@@ -188,6 +188,43 @@ class ScalarOqlExpression extends ScalarExpression implements CheckableExpressio
 	}
 }
 
+class NestedQueryOqlExpression extends NestedQueryExpression implements CheckableExpression
+{
+	/** @var OQLObjectQuery */
+	private $m_oOQLObjectQuery;
+
+	/**
+	 * NestedQueryOqlExpression constructor.
+	 *
+	 * @param OQLObjectQuery $oOQLObjectQuery
+	 */
+	public function __construct($oOQLObjectQuery )
+	{
+		parent::__construct($oOQLObjectQuery->ToDBSearch(""));
+		$this->m_oOQLObjectQuery = $oOQLObjectQuery;
+	}
+
+	/**
+	 * Recursively check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @param array $aAliases
+	 * @param string $sSourceQuery
+	 *
+	 * @throws \OqlNormalizeException
+	 */
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		$this->m_oOQLObjectQuery->Check($oModelReflection, "", $aAliases);
+	}
+
+	public function GetOQLObjectQuery()
+	{
+		return $this->m_oOQLObjectQuery;
+	}
+}
+
 class FieldOqlExpression extends FieldExpression implements CheckableExpression
 {
 	protected $m_oParent;
@@ -399,7 +436,7 @@ class OqlObjectQuery extends OqlQuery
 	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
 	 * @throws OqlNormalizeException
 	 */	 	
-	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
+	public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParentAliases = array())
 	{
 		$sClass = $this->GetClass($oModelReflection);
 		$sClassAlias = $this->GetClassAlias();
@@ -409,7 +446,7 @@ class OqlObjectQuery extends OqlQuery
 			throw new UnknownClassOqlException($sSourceQuery, $this->GetClassDetails(), $oModelReflection->GetClasses());
 		}
 
-		$aAliases = array($sClassAlias => $sClass);
+		$aAliases = array_merge(array($sClassAlias => $sClass),$aParentAliases);
 
 		$aJoinSpecs = $this->GetJoins();
 		if (is_array($aJoinSpecs))
@@ -567,6 +604,7 @@ class OqlUnionQuery extends OqlQuery
 
 	public function __construct(OqlObjectQuery $oLeftQuery, OqlQuery $oRightQueryOrUnion)
 	{
+		parent::__construct();
 		$this->aQueries[] = $oLeftQuery;
 		if ($oRightQueryOrUnion instanceof OqlUnionQuery)
 		{
@@ -637,6 +675,7 @@ class OqlUnionQuery extends OqlQuery
 		}
 		foreach ($aColumnToClasses as $iColumn => $aClasses)
 		{
+			$sRootClass = null;
 			foreach ($aClasses as $iQuery => $aData)
 			{
 				if ($iQuery == 0)
@@ -709,10 +748,6 @@ class OqlUnionQuery extends OqlQuery
 				// first loop
 				$sAncestor = $sClass;
 			}
-			elseif ($sClass == $sAncestor)
-			{
-				// remains the same
-			}
 			elseif ($oModelReflection->GetRootClass($sClass) != $oModelReflection->GetRootClass($sAncestor))
 			{
 				$sAncestor = null;
@@ -764,4 +799,4 @@ class OqlUnionQuery extends OqlQuery
 		$oSearch = new DBUnionSearch($aSearches);
 		return $oSearch;
 	}
-}
+}

core/oql/version.txt

@@ -1 +1 @@
-2018-08-31
+2019-12-03

core/oqlclassnode.class.inc.php

@@ -128,6 +128,19 @@ class OQLClassNode
 		return $sOQL;
 	}
 
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		foreach ($this->GetJoins() as $aJoins)
+		{
+			/** @var \OQLJoin $oJoin */
+			foreach ($aJoins as $oJoin)
+			{
+				$oJoin->GetOOQLClassNode()->Browse($callback);
+			}
+		}
+	}
+
 	public function GetExternalKeys()
 	{
 		return $this->aExtKeys;
@@ -318,4 +331,4 @@ class OQLJoin
 		return $this->sRightField;
 	}
 
-}
+}

core/oqlclasstreebuilder.class.inc.php

@@ -8,7 +8,7 @@
 class OQLClassTreeBuilder
 {
 	/** @var \DBObjectSearch  */
-	private $oDBObjetSearch;
+	private $oDBObjectSearch;
 	/** @var OQLClassNode */
 	private $oOQLClassNode;
 	/** @var \QueryBuilderContext  */
@@ -23,10 +23,10 @@ class OQLClassTreeBuilder
 	 * @param \DBObjectSearch $oDBObjetSearch
 	 * @param \QueryBuilderContext $oBuild
 	 */
-	public function __construct($oDBObjetSearch, $oBuild)
+	protected function __construct($oDBObjetSearch, $oBuild)
 	{
 		$this->oBuild = $oBuild;
-		$this->oDBObjetSearch = $oDBObjetSearch;
+		$this->oDBObjectSearch = $oDBObjetSearch;
 		$this->sClass = $oDBObjetSearch->GetFirstJoinedClass();
 		$this->sClassAlias = $oDBObjetSearch->GetFirstJoinedClassAlias();
 		if (empty($this->sClassAlias))
@@ -36,6 +36,25 @@ class OQLClassTreeBuilder
 		$this->oOQLClassNode = new OQLClassNode($oBuild, $this->sClass, $this->sClassAlias);
 	}
 
+	/**
+	 * @param \DBObjectSearch $oDBObjetSearch
+	 * @param \QueryBuilderContext $oBuild
+	 *
+	 * @return \OQLClassNode
+	 * @throws \CoreException
+	 */
+	public static function GetOQLClassTree($oDBObjetSearch, $oBuild)
+	{
+		$oOQLClassTreeBuilder = new OQLClassTreeBuilder($oDBObjetSearch, $oBuild);
+		$oOQLClassNode = $oOQLClassTreeBuilder->DevelopOQLClassNode();
+		$oOQLClassTreeOptimizer = new OQLClassTreeOptimizer($oOQLClassNode, $oBuild);
+		$oOQLClassTreeOptimizer->OptimizeClassTree();
+		$oOQLActualClassTreeResolver = new OQLActualClassTreeResolver($oOQLClassNode, $oBuild);
+		$oOQLClassNode = $oOQLActualClassTreeResolver->Resolve();
+
+		return $oOQLClassNode;
+	}
+
 	/**
 	 * Develop OQL.
 	 * Add joins from OQL (outgoing and incoming)
@@ -50,6 +69,7 @@ class OQLClassTreeBuilder
 	 */
 	public function DevelopOQLClassNode()
 	{
+		$this->TranslateNestedRequests();
 		$this->AddExternalKeysFromSearch();
 		$aPolymorphicJoinAlias = $this->TranslatePolymorphicExpressions();
 		$this->AddExpectedExternalFields();
@@ -69,7 +89,7 @@ class OQLClassTreeBuilder
 	 */
 	private function AddExternalKeysFromSearch()
 	{
-		foreach ($this->oDBObjetSearch->GetCriteria_PointingTo() as $sKeyAttCode => $aPointingTo)
+		foreach ($this->oDBObjectSearch->GetCriteria_PointingTo() as $sKeyAttCode => $aPointingTo)
 		{
 			if (array_key_exists(TREE_OPERATOR_EQUALS, $aPointingTo))
 			{
@@ -202,7 +222,7 @@ class OQLClassTreeBuilder
 	private function JoinClassesForExternalKeys()
 	{
 		// Get filters from the search outgoing joins
-		$aAllPointingTo = $this->oDBObjetSearch->GetCriteria_PointingTo();
+		$aAllPointingTo = $this->oDBObjectSearch->GetCriteria_PointingTo();
 
 		// Add filters from external keys
 		foreach (array_keys($this->oOQLClassNode->GetExternalKeys()) as $sKeyAttCode)
@@ -316,7 +336,7 @@ class OQLClassTreeBuilder
 	 */
 	private function JoinClassesReferencedBy()
 	{
-		foreach ($this->oDBObjetSearch->GetCriteria_ReferencedBy() as $sForeignClass => $aReferences)
+		foreach ($this->oDBObjectSearch->GetCriteria_ReferencedBy() as $sForeignClass => $aReferences)
 		{
 			foreach ($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
 			{
@@ -375,4 +395,13 @@ class OQLClassTreeBuilder
 			$this->oOQLClassNode->AddLeftJoin($oSelectPoly, 'id', 'id', true);
 		}
 	}
-}
+
+	/**
+	 * Rename class aliases of nested requests to avoid collision with main request
+	 */
+	private function TranslateNestedRequests()
+	{
+		$aClassAliases = $this->oDBObjectSearch->GetJoinedClasses();
+		$this->oDBObjectSearch->RenameNestedQueriesAliasesInNameSpace($aClassAliases);
+	}
+}

core/ormdocument.class.inc.php

@@ -75,6 +75,27 @@ class ormDocument
 		return $this->m_sMimeType;
 	}
 
+	/**
+	 * @return int size in bits
+	 * @uses strlen which returns the no of bits used
+	 * @since 2.7.0
+	 */
+	public function GetSize()
+	{
+		return strlen($this->m_data);
+	}
+
+	/**
+	 * @param int $precision
+	 *
+	 * @return string
+	 * @uses utils::BytesToFriendlyFormat()
+	 */
+	public function GetFormattedSize($precision = 2)
+	{
+		$bytes = $this->GetSize();
+		return utils::BytesToFriendlyFormat($bytes, $precision);
+	}
 	public function GetData()
 	{
 		return $this->m_data;

core/ormpassword.class.inc.php

@@ -35,7 +35,7 @@ class ormPassword
 {
 	protected $m_sHashed;
 	protected $m_sSalt;
-	
+
 	/**
 	 * Constructor, initializes the password from the encrypted values
 	 */
@@ -53,7 +53,7 @@ class ormPassword
 	{
 		$this->m_sHashed = password_hash($sClearTextPassword, PASSWORD_DEFAULT);
 	}
-	
+
 	/**
 	 * Print the password: displays some stars
 	 * @return string

core/ormset.class.inc.php

@@ -160,10 +160,21 @@ class ormSet
 	public function GetValues()
 	{
 		$aValues = array_merge($this->aPreserved, $this->aAdded);
-
+		sort($aValues);
 		return $aValues;
 	}
 
+	public function GetLabels()
+	{
+		$aLabels = array();
+		$aValues = $this->GetValues();
+		foreach ($aValues as $sValue)
+		{
+			$aLabels[$sValue] = $sValue;
+		}
+		return $aLabels;
+	}
+
 	/**
 	 * @return array of tag labels indexed by code for only the added tags
 	 */
@@ -377,4 +388,4 @@ class ormSet
 	}
 
 
-}
+}

core/ormstopwatch.class.inc.php

@@ -525,10 +525,10 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 						$iPercent = $aThresholdData['percent']; // could be different than the index !
 		
 						$sNow = date(AttributeDateTime::GetSQLFormat());
-						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < '$sNow'";
+						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < :now";
 						$oFilter = DBObjectSearch::FromOQL($sExpression);
-						$oSet = new DBObjectSet($oFilter);
-						$oSet->OptimizeColumnLoad(array($sAttCode));
+						$oSet = new DBObjectSet($oFilter, array(), array('now' => $sNow));
+						$oSet->OptimizeColumnLoad(array($sClass => array($sAttCode)));
 						while ((time() < $iTimeLimit) && ($oObj = $oSet->Fetch()))
 						{
 							$sClass = get_class($oObj);
@@ -590,9 +590,8 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							if($oObj->IsModified())
 							{
 								CMDBObject::SetTrackInfo("Automatic - threshold triggered");
-					
-								$oMyChange = CMDBObject::GetCurrentChange();
-								$oObj->DBUpdateTracked($oMyChange);
+
+								$oObj->DBUpdate();
 							}
 
 							// Activate any existing trigger

core/ownershiplock.class.inc.php

@@ -180,7 +180,7 @@ class iTopOwnershipLock
 	{
 		if ($this->IsTokenValid())
 		{
-			return MetaModel::GetObject('User', $this->oToken->Get('user_id'), false);
+			return MetaModel::GetObject('User', $this->oToken->Get('user_id'), false, true);
 		}
 		return null;
 	}
@@ -349,4 +349,4 @@ class iTopOwnershipLock
 		}
 		
 	}
-}
+}

core/querybuildercontext.class.inc.php

@@ -33,6 +33,7 @@ class QueryBuilderContext
 	protected $m_aFilteredTables;
 	protected $m_sEmptyClassAlias;
 
+	/** @var \QueryBuilderExpressions */
 	public $m_oQBExpressions;
 
 	/**

core/restservices.class.inc.php

@@ -303,7 +303,7 @@ class CoreServices implements iRestServiceProvider
 	 *
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
 	 * @param string $sVerb
-	 * @param $aParams
+	 * @param object $aParams
 	 *
 	 * @return RestResult The standardized result structure (at least a message)
 	 * @throws \CoreException
@@ -476,6 +476,7 @@ class CoreServices implements iRestServiceProvider
 			break;
 
 		case 'core/delete':
+			RestUtils::InitTrackingComment($aParams);
 			$sClass = RestUtils::GetClass($aParams, 'class');
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$bSimulate = RestUtils::GetOptionalParam($aParams, 'simulate', false);

core/sqlobjectquery.class.inc.php

@@ -318,7 +318,40 @@ class SQLObjectQuery extends SQLQuery
 		return "UPDATE $sFrom SET $sValues WHERE $sWhere";
 	}
 
-	// Interface, build the SQL query
+
+	/**
+	 * Generate an INSERT statement.
+	 * Note : unlike `RenderUpdate` and `RenderSelect`, it is limited to one and only one table.
+	 *
+	 *
+	 * @param array $aArgs
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderInsert($aArgs = array())
+	{
+		$this->PrepareRendering();
+		$aJoinInfo = reset($this->__aFrom);
+
+		if ($aJoinInfo['jointype'] != 'first' || count($this->__aFrom) > 1)
+		{
+			throw new CoreException('Cannot render insert');
+		}
+
+		$sFrom   = "`{$aJoinInfo['tablename']}`";
+
+		$sColList = '`'.implode('`,`', array_keys($this->m_aValues)).'`';
+
+		$aSetValues = array();
+		foreach ($this->__aSetValues as $sFieldSpec => $value)
+		{
+			$aSetValues[] = CMDBSource::Quote($value);
+		}
+		$sValues = implode(',', $aSetValues);
+
+		return "INSERT INTO $sFrom ($sColList) VALUES  ($sValues)";
+	}
+
 
 	/**
 	 * @param array $aOrderBy

core/sqlobjectquerybuilder.class.inc.php

@@ -92,14 +92,7 @@ class SQLObjectQueryBuilder
 	 */
 	private function GetOQLClassTree($oBuild)
 	{
-		$oOQLClassTreeBuilder = new OQLClassTreeBuilder($this->oDBObjetSearch, $oBuild);
-		$oOQLClassNode = $oOQLClassTreeBuilder->DevelopOQLClassNode();
-		$oOQLClassTreeOptimizer = new OQLClassTreeOptimizer($oOQLClassNode, $oBuild);
-		$oOQLClassTreeOptimizer->OptimizeClassTree();
-		$oOQLActualClassTreeResolver = new OQLActualClassTreeResolver($oOQLClassNode, $oBuild);
-		$oOQLClassNode = $oOQLActualClassTreeResolver->Resolve();
-
-		return $oOQLClassNode;
+		return OQLClassTreeBuilder::GetOQLClassTree($this->oDBObjetSearch, $oBuild);
 	}
 
 	/**

core/sqlunionquery.class.inc.php

@@ -91,7 +91,19 @@ class SQLUnionQuery extends SQLQuery
 		throw new Exception(__class__.'::'.__function__.'Not implemented !');
 	}
 
-	// Interface, build the SQL query
+	/**
+	 * Interface, build the SQL query
+	 *
+	 * @param array $aOrderBy
+	 * @param array $aArgs
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @param bool $bGetCount
+	 * @param bool $bBeautifulQuery
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 */
 	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
 	{
 		$this->m_bBeautifulQuery = $bBeautifulQuery;
@@ -101,34 +113,39 @@ class SQLUnionQuery extends SQLQuery
 		foreach ($this->aQueries as $oSQLQuery)
 		{
 			// Render SELECTS without orderby/limit/count
+			/** @var \SQLObjectQuery $oSQLQuery */
 			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
 		}
 		if ($iLimitCount > 0)
 		{
+			$sLimitStart = '(';
 			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+			$sLimitEnd = ')';
 		}
 		else
 		{
+			$sLimitStart = '';
 			$sLimit = '';
+			$sLimitEnd = '';
 		}
 
 		if ($bGetCount)
 		{
-			$sSelects = '('.implode(" $sLimit)$sLineSep UNION$sLineSep(", $aSelects)." $sLimit)";
-			$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
-			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep) AS _union_alderaan_";
+			$sSelects = "({$sLimitStart}".implode(" {$sLimit}{$sLimitEnd}{$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd})";
+			$sFrom = "({$sLineSep}{$sSelects}{$sLineSep}) as __selects__";
+			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM {$sFrom}{$sLineSep}) AS _union_alderaan_";
 		}
 		else
 		{
 			$sOrderBy = $this->aQueries[0]->RenderOrderByClause($aOrderBy);
 			if (!empty($sOrderBy))
 			{
-				$sOrderBy = "ORDER BY $sOrderBy$sLineSep $sLimit";
-				$sSQL = '('.implode(")$sLineSep UNION$sLineSep (", $aSelects).')'.$sLineSep.$sOrderBy;
+				$sOrderBy = "ORDER BY {$sOrderBy}{$sLineSep} {$sLimit}";
+				$sSQL = implode(" {$sLineSep} UNION{$sLineSep} ", $aSelects).$sLineSep.$sOrderBy;
 			}
 			else
 			{
-				$sSQL = '('.implode(" $sLimit)$sLineSep UNION$sLineSep (", $aSelects)." $sLimit)";
+				$sSQL = $sLimitStart.implode(" {$sLimit}{$sLimitEnd} {$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd}";
 			}
 		}
 		return $sSQL;

core/tagsetfield.class.inc.php

@@ -1,20 +1,21 @@
 <?php
-// Copyright (C) 2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-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
+ */
 
 
 /**
@@ -318,7 +319,7 @@ abstract class TagSetFieldData extends cmdbAbstractObject
 			$oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sTagCode'");
 			$oSet = new DBObjectSet($oFilter);
 			$iCount = $oSet->Count();
-			$oPage->SetCurrentTab(Dict::Format('Core:TagSetFieldData:WhereIsThisTagTab', $iCount));
+			$oPage->SetCurrentTab('Core:TagSetFieldData:WhereIsThisTagTab', Dict::Format('Core:TagSetFieldData:WhereIsThisTagTab', $iCount));
 
 			if ($iCount === 0)
 			{

core/tar-itop.class.inc.php

@@ -45,4 +45,4 @@ class ITopArchiveTar extends Archive_Tar
 	{
 		IssueLog::Warning($p_message);
 	}
-}
+}

core/trigger.class.inc.php

@@ -54,17 +54,50 @@ abstract class Trigger extends cmdbAbstractObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("action_list", array("linked_class" => "lnkTriggerAction", "ext_key_to_me" => "trigger_id", "ext_key_to_remote" => "action_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array())));
+		$aTags = ContextTag::GetTags();
+		MetaModel::Init_AddAttribute( new AttributeEnumSet("context", array("allowed_values" => null, "possible_values" => new ValueSetEnum($aTags), "sql" => "context", "depends_on" => array(), "is_null_allowed" => true, "max_items" => 12)));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'context', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass')); // Attributes to be displayed for a list
 		// 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
 	}
 
+	/**
+	 * Check if the trigger can be used in the current context
+	 *
+	 * @return bool true if context OK
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
+	public function IsContextValid()
+	{
+		// Check the context
+		$oContext = $this->Get('context');
+		$bChecked = false;
+		$bValid = false;
+		foreach ($oContext->GetValues() as $sValue)
+		{
+			$bChecked = true;
+			if (ContextTag::Check($sValue))
+			{
+				$bValid = true;
+				break;
+			}
+		}
+		if ($bChecked && !$bValid)
+		{
+			// Trigger does not match the current context
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * @param $aContextArgs
 	 *
@@ -73,6 +106,15 @@ abstract class Trigger extends cmdbAbstractObject
 	 */
 	public function DoActivate($aContextArgs)
 	{
+		// Check the context
+		if (!$this->IsContextValid())
+		{
+			// Trigger does not match the current context
+			IssueLog::Info("Context NOT valid for: ".$this->Get('friendlyname'));
+			return;
+		}
+		IssueLog::Info("Context VALID for: ".$this->Get('friendlyname'));
+
 		// Find the related actions
 		$oLinkedActions = $this->Get('action_list');
 		while ($oLink = $oLinkedActions->Fetch())
@@ -133,7 +175,7 @@ abstract class TriggerOnObject extends Trigger
 		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values" => null, "sql" => "filter", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('default_search', array('description', 'target_class'));  // Default criteria of the search banner
@@ -258,7 +300,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 	}
@@ -292,7 +334,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeClassState("state", array("class_field" => 'target_class', "allowed_values" => null, "sql" => "state", "default_value" => null, "is_null_allowed" => false, "depends_on" => array('target_class'))));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -326,7 +368,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -360,7 +402,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -394,7 +436,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -428,7 +470,7 @@ class TriggerOnObjectDelete extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -464,7 +506,7 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeClassAttCodeSet('target_attcodes', array("allowed_values" => null, "class_field" => "target_class", "sql" => "target_attcodes", "default_value" => null, "is_null_allowed" => true, "max_items" => 20, "min_items" => 0, "attribute_definition_exclusion_list" => "AttributeDashboard,AttributeExternalField,AttributeFinalClass,AttributeFriendlyName,AttributeObsolescenceDate,AttributeObsolescenceFlag,AttributeSubItem", "attribute_definition_list" => null, "depends_on" => array('target_class'))));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'target_attcodes', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'filter', 'target_attcodes', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -599,7 +641,7 @@ class TriggerOnThresholdReached extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeString("threshold_index", array("allowed_values" => null, "sql" => "threshold_index", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'context', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'threshold_index', 'threshold_index')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form

core/userrights.class.inc.php

@@ -1,30 +1,22 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * User rights management API
+ * Copyright (C) 2013-2020 Combodo SARL
  *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * 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
  */
 
-
 class UserRightException extends CoreException
 {
 }
@@ -168,7 +160,7 @@ abstract class User extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core,grant_by_profile",
+			"category" => "core,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "login",
 			"state_attcode" => "",
@@ -419,7 +411,7 @@ abstract class User extends cmdbAbstractObject
 		parent::DisplayBareRelations($oPage, $bEditMode);
 		if (!$bEditMode)
 		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
 			$this->DoShowGrantSumary($oPage, 'bizmodel,grant_by_profile');
 
 			// debug
@@ -837,6 +829,7 @@ class UserRights
 		}
 	}
 
+	/** User */
 	public static function GetUserObject()
 	{
 		if (is_null(self::$m_oUser))
@@ -1005,7 +998,7 @@ class UserRights
 		try
 		{
 			// Check Bug 1436 for details
-			if (MetaModel::HasCategory($sClass, 'bizmodel'))
+			if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'silo'))
 			{
 				return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
 			}
@@ -1122,7 +1115,7 @@ class UserRights
 		{
 			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
 			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return falUR_ALLOWED_NOse;
+			if ($iActionCode == UR_ACTION_BULK_MODIFY) return UR_ALLOWED_NO;
 			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
 		}
 

css/blue_green.css

@@ -1,222 +0,0 @@
-/* CSS Document */
-body {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #68a;
-    color:#000000;
-	margin: 0;			/* Remove body margin/padding */
-	padding: 0;
-	overflow: hidden;	/* Remove scroll bars on browser window */
-}
-
-table {
-	border: 1px solid #000000;
-}
-
-.raw_output {
-    font-family: Courier-New, Courier, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #eeeeee;
-    color: #000000;
-    border: 1px dashed #000000;
-    padding: 0.25em;
-    margin-top: 1em;
-}
-
-th {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#ace27d;	
-}
-
-td {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-	background-color: #b7cfe8;
-}
-
-tr.clicked td {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-	background-color: #ffcfe8;
-}
-
-td.label {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#ace27d;
-    padding: 0.2em;	
-}
-
-td a, td a:visited {
-	text-decoration:none;
-	color:#000000;
-}
-td a:hover {
-	text-decoration:underline;
-	color:#FFFFFF;
-}
-
-a.small_action {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-	text-decoration:none;
-}
-
-.display_block {
-	noborder: 1px dashed #CCC;
-	background: #79b;
-	padding:0.25em;
-}
-div#TopPane .display_block {
-	background: #f0eee0;
-	padding:0.25em;
-	text-align:center;
-}
-div#TopPane label {
-	color:#000;
-	background: #f0eee0;
-}
-
-div#TopPane td {
-	color:#000;
-	background: #f0eee0;
-}
-
-.loading {
-	noborder: 1px dashed #CCC;
-	background: #b9c1c8;
-	padding:0.25em;
-}
-
-label {
-	font-family:Georgia, "Times New Roman", Times, serif;
-	color:#FFFFFF;
-	text-align:right;
-}
-
-input.textSearch {
-	border:1px solid #333;
-	noheight:1.2em;
-	font-size:0.8em;
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	color:#000000;
-}
-
-/* By Rom */
-.csvimport_createobj {
-    color: #AA0000;
-    background-color:#EEEEEE;
-}
-.csvimport_error {
-    font-weight: bold;
-    color: #FF0000;
-    background-color:#EEEEEE;
-}
-.csvimport_warning {
-    color: #CC8888;
-    background-color:#EEEEEE;
-}
-.csvimport_ok {
-    color: #000000;
-    background-color:#BBFFBB;
-}
-.csvimport_reconkey {
-    font-style: italic;
-    color: #888888;
-    background-color:#FFFFFF;
-}
-.csvimport_extreconkey {
-    color: #888888;
-    background-color:#FFFFFF;
-}
-
-.treeview, .treeview ul { 
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}	
-
-.treeview li { 
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-	font-size:0.9em;
-}
-
-ul.dir li {
-	padding: 2px 0 0 16px;
-}
-
-.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
-.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
-.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
-.treeview .last { background-image: url(../images/tv-item-last.gif); }
-.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
-.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
-
-#Header { padding: 0; background:#ccc url(../images/bandeau2.gif) repeat-x center;}
-div.iTopLogo {
-	background:url(../images/iTop.gif) no-repeat center;
-	width:100px;
-	height:56px;
-}
-div.iTopLogo span {
-	display:none;
-}
-
-#MySplitter {
-	/* Height is set to match window size in $().ready() below */
-	border:0px;
-	margin:4px;
-	padding:0px;
-	min-width: 100px;	/* Splitter can't be too thin ... */
-	min-height: 100px;	/* ... or too flat */
-}
-#LeftPane {
-	background: #f0eee0;
-	padding: 4px;
-	overflow: auto;		/* Scroll bars appear as needed */
-	color:#666;
-}
-#TopPane {				/* Top nested in right pane */
-	background: #f0eee0;
-	padding: 4px;
-	height: 150px;		/* Initial height */
-	min-height: 75px;	/* Minimum height */
-	overflow: auto;	
-	color:#666;
-}
-#RightPane {			/* Bottom nested in right pane */
-	background: #79b;
-	height:150px;		/* Initial height */
-	min-height:130px;
-	no.padding:15px;
-	no.margin:10px;
-	overflow:auto;
-	color:#fff;
-}
-
-#BottomPane {			/* Bottom nested in right pane */
-	background: #79b;
-	padding: 4px;
-	overflow: auto;
-	color:#fff;
-}
-#MySplitter .vsplitbar {
-	width: 7px;
-	height: 50px;
-	background: #68a url(../images/vgrabber2.gif) no-repeat  center;
-}
-#MySplitter .vsplitbar.active, #MySplitter .vsplitbar:hover {
-	background: #68a url(../images/vgrabber2_active.gif) no-repeat  center;
-}
-#MySplitter .hsplitbar {
-	height: 8px;
-	background: #68a url(../images/hgrabber2.gif) no-repeat center;
-}
-#MySplitter .hsplitbar.active, #MySplitter .hsplitbar:hover {
-	background: #68a url(../images/hgrabber2_active.gif) no-repeat center;
-}

css/css-variables.scss

@@ -1,5 +1,24 @@
+/*!
+ * 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
+ */
+
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.0-dev";
+$version: "v2.7.0-beta2";
+$approot-relative: "../../../../../"; // relative to env-***/branding/themes/***/main.css
 
 // Base colors
 $gray-base:              #000 !default;
@@ -20,33 +39,79 @@ $combodo-orange-darker:		darken($combodo-orange, 18%) !default;
 $combodo-dark-gray-dark:	darken($combodo-dark-gray, 13.5%) !default;
 $combodo-dark-gray-darker:	darken($combodo-dark-gray, 18%) !default;
 
-// Vars
-$highlight-color: $combodo-orange;
-$grey-color: #555555;
-$complement-color: #1c94c4;
-$complement-light: #d6e8ef;
-$frame-background-color: $gray-extra-light;
-$text-color: #000;
-$box-radius: 0px;
-$box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
+// Brand colors
+// - Bases
+$brand-primary: 	$combodo-orange !default;
+$brand-secondary: 	$combodo-dark-gray !default;
+// - Shades
+$brand-primary-lightest:	lighten($brand-primary, 15%) !default;
+$brand-primary-lighter:		lighten($brand-primary, 10%) !default;
+$brand-primary-light:		lighten($brand-primary, 6%) !default;
+$brand-primary-dark:		darken($brand-primary, 6%) !default;
+$brand-primary-darker:		darken($brand-primary, 10%) !default;
+$brand-primary-darkest:		darken($brand-primary, 15%) !default;
+$brand-secondary-lightest:	lighten($brand-secondary, 15%) !default;
+$brand-secondary-lighter:	lighten($brand-secondary, 10%) !default;
+$brand-secondary-light:		lighten($brand-secondary, 6%) !default;
+$brand-secondary-dark:		darken($brand-secondary, 6%) !default;
+$brand-secondary-darker:	darken($brand-secondary, 10%) !default;
+$brand-secondary-darkest:	darken($brand-secondary, 15%) !default;
 
-$hyperlink-color: $complement-color;
-$hyperlink-text-decoration: none;
+// Vars
+$highlight-color: $brand-primary !default;
+$grey-color: #555555 !default;
+$complement-color: #1c94c4 !default;
+$complement-light: #d6e8ef !default;
+$frame-background-color: $gray-extra-light !default;
+$text-color: #000 !default;
+$box-radius: 0px !default;
+$box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15) !default;
+
+$hyperlink-color: $complement-color !default;
+$hyperlink-text-decoration: none !default;
 
 ////////////
 // Search //
-$search-criteria-box-color: #2D2D2D;
-$search-criteria-box-picto-color: #E87C1E;
-$search-criteria-box-bg-color: #EEEEEE;
-$search-criteria-box-hover-color: $white;
-$search-criteria-box-border-color: #CCCCCC;
-$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
-$search-criteria-box-radius: 1px;
+$search-form-container-color: $white !default;
+$search-form-container-bg-color: $complement-color !default;
 //
-$search-add-criteria-box-color: $search-criteria-box-color;
-$search-add-criteria-box-bg-color: $white;
-$search-add-criteria-box-hover-color: $gray-extra-light;
+$search-criteria-box-color: #2D2D2D !default;
+$search-criteria-box-picto-color: $brand-primary !default;
+$search-criteria-box-bg-color: #EEEEEE !default;
+$search-criteria-box-hover-color: $white !default;
+$search-criteria-box-border-color: #CCCCCC !default;
+$search-criteria-box-border: 1px solid $search-criteria-box-border-color !default;
+$search-criteria-box-radius: 1px !default;
 //
-$search-button-box-color: $combodo-orange;
-$search-button-box-bg-color: $white;
-$search-button-box-bg-hover-color: $gray-extra-light;
+$search-add-criteria-box-color: $search-criteria-box-color !default;
+$search-add-criteria-box-bg-color: $white !default;
+$search-add-criteria-box-hover-color: $gray-extra-light !default;
+//
+$search-button-box-color: $brand-primary !default;
+$search-button-box-bg-color: $white !default;
+$search-button-box-bg-hover-color: $gray-extra-light !default;
+
+// Console elements
+$summary-details-background: $grey-color !default; 
+$main-header-background: $frame-background-color !default;
+$table-even-background: $frame-background-color !default;
+$popup-menu-highlight-color: $highlight-color !default;
+$popup-menu-text-color: #000 !default;
+$popup-menu-background-color: #fff !default;
+$popup-menu-text-higlight-color: #fff !default;
+$breadcrumb-color: #555 !default;
+$breadcrumb-text-color: #fff !default;
+$breadcrumb-highlight-color: $highlight-color !default;
+$breadcrumb-text-highlight-color: #fff !default;
+
+// jQuery UI widgets vars
+$primary-text-color: #333333 !default;
+$secondary-text-color: $grey-color !default;
+$error-text-color: $white !default;
+$highlight-text-color: #363636 !default;
+$hover-background-color: #fde17c !default;
+$border-highlight-color: $brand-primary-dark !default;
+$highlight-item-color: $white !default;
+$content-color: #eeeeee !default; 
+$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
+$icons-filter: hue-rotate(0deg) !default;