advanced search: ShorthandExpansion TODOs list

SVN:b1312[5765]
advanced search: ShorthandExpansion tests
2026-04-24 19:18:44 +02:00 · 2018-05-02 12:19:38 +00:00 · 2018-05-02 08:51:36 +00:00 · 2018-04-27 16:15:08 +00:00 · 2018-04-27 13:26:56 +00:00 · 2018-04-26 15:54:34 +00:00
1141 changed files with 177875 additions and 223004 deletions
--- a/.gitflow
+++ b/.gitflow
@@ -1,9 +0,0 @@
-[gitflow "branch"]
-master = master
-develop = develop
-[gitflow "prefix"]
-feature = feature/
-release = release/
-hotfix = hotfix/
-versiontag =
-support = support/
--- a/.gitignore
+++ b/.gitignore
@@ -1,123 +0,0 @@
-
-/toolkit
-/conf/*
-/env-*/*
-
-# composer reserver directory, from sources, populate/update using "composer install"
-vendor/*
-test/vendor/*
-
-# all datas but listing prevention
-data/*
-!data/.htaccess
-!data/index.php
-!data/web.config
-
-# iTop extensions
-extensions/*
-!extensions/readme.txt
-
-# all logs but listing prevention
-log/*
-!log/.htaccess
-!log/index.php
-!log/web.config
-
-
-# Jetbrains
-.idea/**
-!.idea/encodings.xml
-!.idea/codeStyles
-!.idea/codeStyles/*
-!.idea/inspectionProfiles
-!.idea/inspectionProfiles/*
-
-
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-### Eclipse template
-
-.metadata
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,57 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="320" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,body,thead,tbody,tfoot,script,style" />
-      <option name="HTML_DO_NOT_ALIGN_CHILDREN_OF_MIN_LINES" value="4" />
-    </HTMLCodeStyleSettings>
-    <PHPCodeStyleSettings>
-      <option name="CONCAT_SPACES" value="false" />
-      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
-      <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
-      <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
-      <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
-      <option name="LOWER_CASE_NULL_CONST" value="true" />
-      <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
-      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
-      <option name="PHPDOC_USE_FQCN" value="true" />
-    </PHPCodeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="PHP">
-      <option name="RIGHT_MARGIN" value="320" />
-      <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
-      <option name="BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
-      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-        <option name="SMART_TABS" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Combodo" />
-  </state>
-</component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
--- a/.idea/inspectionProfiles/Combodo.xml
+++ b/.idea/inspectionProfiles/Combodo.xml
@@ -1,44 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Combodo" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedMethodInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedLocalVariableInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_INSIDE_LIST" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SqlAddNotNullColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAmbiguousColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAutoIncrementDuplicateInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlCheckUsingColumnsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlConstantConditionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDeprecateTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDerivedTableAliasInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDropIndexedColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlIdentifierInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlInsertValuesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNullComparisonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlPostgresqlSelectFromProcedureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlResolveInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSideEffectsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlStorageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlUnusedVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,19 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="projectProfile" value="Combodo" />
-    <option name="PROJECT_PROFILE" value="Combodo" />
-    <version value="1.0" />
-  </settings>
-</component>
--- a/.jenkins/bin/archive/gather_external_files.sh
+++ b/.jenkins/bin/archive/gather_external_files.sh
--- a/.jenkins/bin/init/append_files.sh
+++ b/.jenkins/bin/init/append_files.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-# create target dirs
-mkdir -p var
-mkdir -p toolkit
-
-# cleanup target dirs
-rm -rf toolkit/*
-
-# fill target dirs
-curl http://www.combodo.com/documentation/iTopDataModelToolkit-2.3.zip | tar xvz --directory toolkit
-cp -r .jenkins/configuration/default-environment/unattended_install/* toolkit
--- a/.jenkins/bin/init/composer_install.sh
+++ b/.jenkins/bin/init/composer_install.sh
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-# on the root dir
-composer install
-
-
-# under the test dir
-cd test
-composer install
--- a/.jenkins/bin/init/debug.sh
+++ b/.jenkins/bin/init/debug.sh
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-whoami
-pwd
-ls
-
-echo "$BRANCH_NAME:${BRANCH_NAME}"
-
-echo "printenv :"
-printenv
-
--- a/.jenkins/bin/tests/phpunit.sh
+++ b/.jenkins/bin/tests/phpunit.sh
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -x
-
-cd test
-
-export DEBUG_UNIT_TEST="0"
-
-php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity
--- a/.jenkins/bin/unattended_install/default_env.sh
+++ b/.jenkins/bin/unattended_install/default_env.sh
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-cd toolkit
-php unattended_install.php default-params.xml
--- a/.jenkins/configuration/default-environment/unattended_install/default-config-itop.php
+++ b/.jenkins/configuration/default-environment/unattended_install/default-config-itop.php
@@ -1,285 +0,0 @@
-<?php
-
-/**
- *
- * Configuration file, generated by the iTop configuration wizard
- *
- * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
- *
- */
-$MySettings = array(
-
-	// access_message: Message displayed to the users when there is any access restriction
-	//	default: 'iTop is temporarily frozen, please wait... (the admin team)'
-	'access_message' => 'iTop is temporarily frozen, please wait... (the admin team)',
-
-	// access_mode: Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3
-	//	default: 3
-	'access_mode' => 3,
-
-	'allowed_login_types' => 'form|basic|external',
-
-	// apc_cache.enabled: If set, the APC cache is allowed (the PHP extension must also be active)
-	//	default: true
-	'apc_cache.enabled' => true,
-
-	// apc_cache.query_ttl: Time to live set in APC for the prepared queries (seconds - 0 means no timeout)
-	//	default: 3600
-	'apc_cache.query_ttl' => 3600,
-
-	// app_root_url: Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server's name)
-	//	default: ''
-	'app_root_url' => 'http://127.0.0.1/itop/svn/trunk/',
-
-	// buttons_position: Position of the forms buttons: bottom | top | both
-	//	default: 'both'
-	'buttons_position' => 'both',
-
-	// cas_include_path: The path where to find the phpCAS library
-	//	default: '/usr/share/php'
-	'cas_include_path' => '/usr/share/php',
-
-	// cron_max_execution_time: Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout
-	//	default: 600
-	'cron_max_execution_time' => 600,
-
-	// csv_file_default_charset: Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).
-	//	default: 'ISO-8859-1'
-	'csv_file_default_charset' => 'ISO-8859-1',
-
-	'csv_import_charsets' => array (
-	),
-
-	// csv_import_history_display: Display the history tab in the import wizard
-	//	default: false
-	'csv_import_history_display' => false,
-
-	// date_and_time_format: Format for date and time display (per language)
-	//	default: array (
-	//		  'default' =>
-	//		  array (
-	//		    'date' => 'Y-m-d',
-	//		    'time' => 'H:i:s',
-	//		    'date_time' => '$date $time',
-	//		  ),
-	//		)
-	'date_and_time_format' => array (
-		'default' =>
-			array (
-				'date' => 'Y-m-d',
-				'time' => 'H:i:s',
-				'date_time' => '$date $time',
-			),
-		'FR FR' =>
-			array (
-				'date' => 'd/m/Y',
-				'time' => 'H:i:s',
-				'date_time' => '$date $time',
-			),
-	),
-
-	'db_host' => '',
-
-	'db_name' => 'itop_ci_main',
-
-	'db_pwd' => 'IKnowYouSeeMeInJenkinsConf',
-
-	'db_subname' => '',
-
-	'db_user' => 'jenkins_itop',
-
-	// deadline_format: The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$
-	//	default: '$difference$'
-	'deadline_format' => '$difference$',
-
-	'default_language' => 'EN US',
-
-	// disable_attachments_download_legacy_portal: Disable attachments download from legacy portal
-	//	default: true
-	'disable_attachments_download_legacy_portal' => true,
-
-	// draft_attachments_lifetime: Lifetime (in seconds) of drafts' attachments and inline images: after this duration, the garbage collector will delete them.
-	//	default: 3600
-	'draft_attachments_lifetime' => 3600,
-
-	// email_asynchronous: If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode
-	//	default: false
-	'email_asynchronous' => false,
-
-	// email_default_sender_address: Default address provided in the email from header field.
-	//	default: ''
-	'email_default_sender_address' => '',
-
-	// email_default_sender_label: Default label provided in the email from header field.
-	//	default: ''
-	'email_default_sender_label' => '',
-
-	// email_transport: Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocole)
-	//	default: 'PHPMail'
-	'email_transport' => 'SMTP',
-
-	// email_transport_smtp.host: host name or IP address (optional)
-	//	default: 'localhost'
-	'email_transport_smtp.host' => 'smtp.combodo.com',
-
-	// email_transport_smtp.password: Authentication password (optional)
-	//	default: ''
-	'email_transport_smtp.password' => 'IDoNotWork',
-
-	// email_transport_smtp.port: port number (optional)
-	//	default: 25
-	'email_transport_smtp.port' => 25,
-
-	// email_transport_smtp.username: Authentication user (optional)
-	//	default: ''
-	'email_transport_smtp.username' => 'test2@combodo.com',
-
-	// email_validation_pattern: 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,}'
-	'email_validation_pattern' => '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}',
-
-	'encryption_key' => '@iT0pEncr1pti0n!',
-
-	'ext_auth_variable' => '$_SERVER[\'REMOTE_USER\']',
-
-	'fast_reload_interval' => '60',
-
-	// graphviz_path: Path to the Graphviz "dot" executable for graphing objects lifecycle
-	//	default: '/usr/bin/dot'
-	'graphviz_path' => '/usr/bin/dot',
-
-	// inline_image_max_display_width: The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.
-	//	default: '250'
-	'inline_image_max_display_width' => 250,
-
-	// inline_image_max_storage_width: The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.
-	//	default: '1600'
-	'inline_image_max_storage_width' => 1600,
-
-	// link_set_attribute_qualifier: Link set from string: attribute qualifier (encloses both the attcode and the value)
-	//	default: '\''
-	'link_set_attribute_qualifier' => '\'',
-
-	// link_set_attribute_separator: Link set from string: attribute separator
-	//	default: ';'
-	'link_set_attribute_separator' => ';',
-
-	// link_set_item_separator: Link set from string: line separator
-	//	default: '|'
-	'link_set_item_separator' => '|',
-
-	// link_set_value_separator: Link set from string: value separator (between the attcode and the value itself
-	//	default: ':'
-	'link_set_value_separator' => ':',
-
-	'log_global' => true,
-
-	'log_issue' => true,
-
-	'log_notification' => true,
-
-	'log_web_service' => true,
-
-	// max_combo_length: The maximum number of elements in a drop-down list. If more then an autocomplete will be used
-	//	default: 50
-	'max_combo_length' => 50,
-
-	'max_display_limit' => '15',
-
-	// max_linkset_output: Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.
-	//	default: 100
-	'max_linkset_output' => 100,
-
-	'min_display_limit' => '10',
-
-	// online_help: Hyperlink to the online-help web page
-	//	default: 'http://www.combodo.com/itop-help'
-	'online_help' => 'http://www.combodo.com/itop-help',
-
-	// php_path: Path to the php executable in CLI mode
-	//	default: 'php'
-	'php_path' => 'php',
-
-	// portal_tickets: CSV list of classes supported in the portal
-	//	default: 'UserRequest'
-	'portal_tickets' => 'UserRequest',
-
-	'query_cache_enabled' => true,
-
-	// search_manual_submit: Force manual submit of search requests (class => true)
-	//	default: false
-	'search_manual_submit' => array (
-		'Person' => true,
-	),
-
-	'secure_connection_required' => false,
-
-	// session_name: The name of the cookie used to store the PHP session id
-	//	default: 'iTop'
-	'session_name' => 'iTop',
-
-	// shortcut_actions: Actions that are available as direct buttons next to the "Actions" menu
-	//	default: 'UI:Menu:Modify,UI:Menu:New'
-	'shortcut_actions' => 'UI:Menu:Modify,UI:Menu:New',
-
-	// source_dir: Source directory for the datamodel files. (which gets compiled to env-production).
-	//	default: ''
-	'source_dir' => 'datamodels/2.x/',
-
-	'standard_reload_interval' => '300',
-
-	// synchro_trace: Synchronization details: none, display, save (includes 'display')
-	//	default: 'none'
-	'synchro_trace' => 'none',
-
-	// timezone: Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP
-	//	default: 'Europe/Paris'
-	'timezone' => 'Europe/Paris',
-
-	// tracking_level_linked_set_default: Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)
-	//	default: 1
-	'tracking_level_linked_set_default' => 0,
-
-	// url_validation_pattern: Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)
-	//	default: '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?'
-	'url_validation_pattern' => '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?',
-);
-
-/**
- *
- * Modules specific settings
- *
- */
-$MyModuleSettings = array(
-	'itop-attachments' => array (
-		'allowed_classes' => array (
-			0 => 'Ticket',
-		),
-		'position' => 'relations',
-		'preview_max_width' => 290,
-	),
-	'itop-backup' => array (
-		'mysql_bindir' => '',
-		'week_days' => 'monday, tuesday, wednesday, thursday, friday',
-		'time' => '23:30',
-		'retention_count' => 5,
-		'enabled' => true,
-		'debug' => false,
-	),
-	'molkobain-console-tooltips' => array (
-		'decoration_class' => 'fas fa-question',
-		'enabled' => true,
-	),
-);
-
-/**
- *
- * Data model modules to be loaded. Names are specified as relative paths
- *
- */
-$MyModules = array(
-	'addons' => array (
-		'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
-	),
-);
-?>
--- a/.jenkins/configuration/default-environment/unattended_install/default-params.xml
+++ b/.jenkins/configuration/default-environment/unattended_install/default-params.xml
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<installation>
-<!-- On manual installs, this file is generated in setup/install-*.xml -->
-    <mode>upgrade</mode>
-    <preinstall>
-        <copies type="array"/>
-    </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>
-    <extensions_dir>extensions</extensions_dir>
-    <target_env>production</target_env>
-    <workspace_dir></workspace_dir>
-    <database>
-        <server></server>
-        <user>jenkins_itop</user>
-        <pwd>IKnowYouSeeMeInJenkinsConf</pwd>
-        <name>itop_ci</name>
-        <db_tls_enabled></db_tls_enabled>
-        <db_tls_ca></db_tls_ca>
-        <prefix></prefix>
-    </database>
-    <url>http://127.0.0.1/itop/svn/trunk/</url>
-    <graphviz_path>/usr/bin/dot</graphviz_path>
-    <admin_account>
-        <user>admin</user>
-        <pwd>admin</pwd>
-        <language>EN US</language>
-    </admin_account>
-    <language>EN US</language>
-    <selected_modules type="array">
-      <item>authent-external</item>
-      <item>authent-local</item>
-      <item>itop-backup</item>
-      <item>itop-config</item>
-      <item>itop-profiles-itil</item>
-      <item>itop-sla-computation</item>
-      <item>itop-tickets</item>
-      <item>itop-welcome-itil</item>
-      <item>itop-config-mgmt</item>
-      <item>itop-attachments</item>
-      <item>itop-datacenter-mgmt</item>
-      <item>itop-endusers-devices</item>
-      <item>itop-storage-mgmt</item>
-      <item>itop-virtualization-mgmt</item>
-      <item>itop-bridge-virtualization-storage</item>
-      <item>itop-service-mgmt</item>
-      <item>itop-request-mgmt</item>
-      <item>itop-portal</item>
-      <item>itop-portal-base</item>
-      <item>itop-change-mgmt</item>
-      <item>itop-knownerror-mgmt</item>
-    </selected_modules>
-    <selected_extensions type="array">
-      <item>itop-config-mgmt-core</item>
-      <item>itop-config-mgmt-datacenter</item>
-      <item>itop-config-mgmt-end-user</item>
-      <item>itop-config-mgmt-storage</item>
-      <item>itop-config-mgmt-virtualization</item>
-      <item>itop-service-mgmt-enterprise</item>
-      <item>itop-ticket-mgmt-simple-ticket</item>
-      <item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
-      <item>itop-change-mgmt-simple</item>
-      <item>itop-kown-error-mgmt</item>
-    </selected_extensions>
-    <sample_data>1</sample_data>
-    <old_addon></old_addon>
-    <options>
-        <generate_config>1</generate_config>
-    </options>
-    <mysql_bindir></mysql_bindir>
-</installation>
--- a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
+++ b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
@@ -1,190 +0,0 @@
-<?php
-//this scrit will be run under the ./toolkit directory, relatively to the document root
-
-require_once('../approot.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');
-require_once(APPROOT.'/core/log.class.inc.php');
-require_once(APPROOT.'/core/kpi.class.inc.php');
-require_once(APPROOT.'/core/cmdbsource.class.inc.php');
-require_once(APPROOT.'/setup/setuppage.class.inc.php');
-require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
-require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
-require_once(APPROOT.'/setup/applicationinstaller.class.inc.php');
-
-
-
-/////////////////////////////////////////////////
-$sParamFile = utils::ReadParam('response_file', 'default-params.xml', true /* CLI allowed */, 'raw_data');
-$bCheckConsistency = (utils::ReadParam('check_consistency', '0', true /* CLI allowed */) == '1');
-
-$oParams = new XMLParameters($sParamFile);
-$sMode = $oParams->Get('mode');
-
-if ($sMode == 'install')
-{
-	echo "Installation mode detected.\n";
-	$bClean = utils::ReadParam('clean', false, true /* CLI allowed */);
-	if ($bClean)
-	{
-		echo "Cleanup mode detected.\n";
-		$sTargetEnvironment = $oParams->Get('target_env', '');
-		if ($sTargetEnvironment == '')
-		{
-			$sTargetEnvironment = 'production';
-		}
-		$sTargetDir = APPROOT.'env-'.$sTargetEnvironment;
-
-		// Configuration file
-		$sConfigFile = APPCONF.$sTargetEnvironment.'/'.ITOP_CONFIG_FILE;
-		if (file_exists($sConfigFile))
-		{
-			echo "Trying to delete the configuration file: '$sConfigFile'.\n";
-			@chmod($sConfigFile, 0770); // RWX for owner and group, nothing for others
-			unlink($sConfigFile);
-		}
-		else
-		{
-			echo "No config file to delete ($sConfigFile does not exist).\n";
-		}
-
-		// env-xxx directory
-		if (file_exists($sTargetDir))
-		{
-			if (is_dir($sTargetDir))
-			{
-				echo "Emptying the target directory '$sTargetDir'.\n";
-				SetupUtils::tidydir($sTargetDir);
-			}
-			else
-			{
-				die("ERROR the target dir '$sTargetDir' exists, but is NOT a directory !!!\nExiting.\n");
-			}
-		}
-		else
-		{
-			echo "No target directory to delete ($sTargetDir does not exist).\n";
-		}
-
-		// Database
-		$aDBSettings = $oParams->Get('database', array());
-		$sDBServer = $aDBSettings['server'];
-		$sDBUser = $aDBSettings['user'];
-		$sDBPwd = $aDBSettings['pwd'];
-		$sDBName = $aDBSettings['name'];
-		$sDBPrefix = $aDBSettings['prefix'];
-
-		if ($sDBPrefix != '')
-		{
-			die("Cleanup not implemented for a partial database (prefix= '$sDBPrefix')\nExiting.");
-		}
-
-		$oMysqli = new mysqli($sDBServer, $sDBUser, $sDBPwd);
-		if ($oMysqli->connect_errno)
-		{
-			die("Cannot connect to the MySQL server (".$mysqli->connect_errno . ") ".$mysqli->connect_error."\nExiting");
-		}
-		else
-		{
-			if ($oMysqli->select_db($sDBName))
-			{
-				echo "Deleting database '$sDBName'\n";
-				$oMysqli->query("DROP DATABASE `$sDBName`");
-			}
-			else
-			{
-				echo "The database '$sDBName' does not seem to exist. Nothing to cleanup.\n";
-			}
-		}
-	}
-}
-
-$bHasErrors = false;
-$aChecks = SetupUtils::CheckBackupPrerequisites(APPROOT.'data'); // mmm should be the backup destination dir
-
-$aSelectedModules = $oParams->Get('selected_modules');
-$sSourceDir = $oParams->Get('source_dir', 'datamodels/latest');
-$sExtensionDir = $oParams->Get('extensions_dir', 'extensions');
-$aChecks = array_merge($aChecks, SetupUtils::CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules));
-
-
-foreach($aChecks as $oCheckResult)
-{
-	switch($oCheckResult->iSeverity)
-	{
-		case CheckResult::ERROR:
-			$bHasErrors = true;
-			$sHeader = "Error";
-			break;
-
-		case CheckResult::WARNING:
-			$sHeader = "Warning";
-			break;
-
-		case CheckResult::INFO:
-		default:
-			$sHeader = "Info";
-			break;
-	}
-	echo $sHeader.": ".$oCheckResult->sLabel;
-	if (strlen($oCheckResult->sDescription))
-	{
-		echo ' - '.$oCheckResult->sDescription;
-	}
-	echo "\n";
-}
-
-if ($bHasErrors)
-{
-	echo "Encountered stopper issues. Aborting...\n";
-	die;
-}
-
-$bFoundIssues = false;
-
-$bInstall = utils::ReadParam('install', true, true /* CLI allowed */);
-if ($bInstall)
-{
-	echo "Starting the unattended installation...\n";
-	$oWizard = new ApplicationInstaller($oParams);
-	$bRes = $oWizard->ExecuteAllSteps();
-	if (!$bRes)
-	{
-		echo "\nencountered installation issues!";
-		$bFoundIssues = true;
-	}
-}
-else
-{
-	echo "No installation requested.\n";
-}
-if (!$bFoundIssues && $bCheckConsistency)
-{
-	echo "Checking data model consistency.\n";
-	ob_start();
-	$sCheckRes = '';
-	try
-	{
-		MetaModel::CheckDefinitions(false);
-		$sCheckRes = ob_get_clean();
-	}
-	catch(Exception $e)
-	{
-		$sCheckRes = ob_get_clean()."\nException: ".$e->getMessage();
-	}
-	if (strlen($sCheckRes) > 0)
-	{
-		echo $sCheckRes;
-		echo "\nfound consistency issues!";
-		$bFoundIssues = true;
-	}
-}
-
-if (!$bFoundIssues)
-{
-	// last line: used to check the install
-	// the only way to track issues in case of Fatal error or even parsing error!
-	echo "\ninstalled!";
-	exit;
-}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,100 +0,0 @@
-# Contributing to iTop
-
-You want to contribute to iTop? Many thanks to you! 🎉 👍
-
-Here are some guidelines that will help us integrate your work!
-
-
-## Contributions
-
-### Subjects
-You are welcome to create pull requests on any of those subjects:
-
-* 🐛 `:bug:` bug fix
-* 🔒 `:lock:` security
-* 🌐 `:globe_with_meridians:` translation
-
-If you want to implement a **new feature**, please [create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) for review.   
-If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the ticket. 
-
-### License
-iTop is distributed under the AGPL-3.0 license (see the [license.txt] file), 
-your code must comply with this license.
-
-If you want to use another license, you may [create an extension][wiki new ext].
-
-[license.txt]: https://github.com/Combodo/iTop/blob/develop/license.txt
-[wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension
-
-
-## Branch model
-
-TL;DR:
-> **create a fork from iTop main repository,  
-> create a branch based on either release branch if present, or develop otherwise**
-
-We are using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. That means we have in our repo those 
-main branches:
-
- develop: ongoing development version
- release/*: if present, that means we are working on a beta version
- master: previous stable version
-
-For example, if no beta version is currently ongoing we could have:
-
- develop containing 2.8 version
- master containing 2.7 version
-
-In this example, when 2.8 beta is shipped that will become:
-
- develop: 2.9 version
- release/2.8: 2.8 beta
- master: 2.7 version
-
-And when 2.8 final will be out:
-
- develop: 2.9 version
- master: 2.8 version
-
-
-## Coding
-
-### PHP styleguide
-
-Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Acoding_standards).
-
-### Tests
-
-Please create tests that covers as much as possible the code you're submitting.
-
-Our tests are located in the `test/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.
-
-### Git Commit Messages
-
-* Describe the functional change instead of the technical modifications
-* Use the present tense ("Add feature" not "Added feature")
-* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
-* Limit the first line to 72 characters or less
-* Please start the commit message with an applicable emoji (following the [Gitmoji guide](https://gitmoji.carloscuesta.me/).). For example :
-    * 🌐 `:globe_with_meridians:` for translations
-    * 🎨 `:art:` when improving the format/structure of the code
-    * ⚡️ `:zap:` when improving performance
-    * 🐛 `:bug:` when fixing a bug
-    * 🔥 `:fire:` when removing code or files
-    * 💚 `:green_heart:` when fixing the CI build
-    * ✅ `:white_check_mark:` when adding tests
-    * 🔒 `:lock:` when dealing with security
-    * ⬆️ `:arrow_up:` when upgrading dependencies
-    * ⬇️ `:arrow_down:` when downgrading dependencies
-    * ♻️ `:recycle:` code refactoring
-    * 💄 `:lipstick:` Updating the UI and style files.
-
-## Pull request
-
-When your code is working, please:
-
-* stash as much as possible your commits,
-* rebase your branch on our repo last commit,
-* create a pull request.
-
-Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
--- a/65
+++ b/65
@@ -1,65 +0,0 @@
-pipeline {
-  agent any
-  stages {
-
-    stage('init') {
-      parallel {
-        stage('debug') {
-          steps {
-            sh './.jenkins/bin/init/debug.sh'
-          }
-        }
-        stage('append files to project') {
-          steps {
-            sh './.jenkins/bin/init/append_files.sh'
-          }
-        }
-        stage('composer install') {
-          steps {
-            sh './.jenkins/bin/init/composer_install.sh'
-          }
-        }
-      }
-    }
-
-    stage('unattended_install') {
-      parallel {
-        stage('unattended_install default env') {
-          steps {
-            sh './.jenkins/bin/unattended_install/default_env.sh'
-          }
-        }
-      }
-    }
-
-    stage('test') {
-      parallel {
-        stage('phpunit') {
-          steps {
-            sh './.jenkins/bin/tests/phpunit.sh'
-          }
-        }
-      }
-    }
-
-  }
-
-  post {
-    always {
-      junit 'var/test/phpunit-log.junit.xml'
-    }
-    failure {
-      slackSend(channel: "#jenkins-itop", color: '#FF0000', message: "Ho no! Build failed! (${currentBuild.result}), Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
-    }
-    fixed {
-      slackSend(channel: "#jenkins-itop", color: '#FFa500', message: "Yes! Build repaired! (${currentBuild.result}), Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
-    }
-  }
-
-  environment {
-    DEBUG_UNIT_TEST = '0'
-  }
-  options {
-    timeout(time: 20, unit: 'MINUTES')
-  }
-}
--- a/README.md
+++ b/README.md
@@ -1,141 +0,0 @@
-<p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
-    <img src="https://www.combodo.com/logos/logo-itop.svg">
-</a></p>
-
-
-# iTop - ITSM & CMDB
- 
-iTop stands for *IT Operations Portal*.
-It is a complete open source, ITIL, web based service management tool including a fully customizable CMDB, a helpdesk system and a document management tool. 
-iTop also offers mass import tools and web services to integrate with your IT
-
-## Features
- Fully configurable [Configuration Management (CMDB)][10]
- [HelpDesk][11] and Incident Management
- [Service and Contract Management][12]
- [Change][13] Management
- Configurable [SLA][14] Management
- Graphical [impact analysis][15]
- [CSV import][16] tool for any data
- Consistency [audit][17] to check data quality
- [Data synchronization][18] (for data federation)
-
-
-## Resources
-
- - [iTop Forums][1]: for support request
- - [iTop Tickets][2]: for feature requests and bug reports
- - [Releases download][3]
- - [iTop documentation][4] for iTop and official extensions
- - [iTop extensions][5] for discovering and installing extensions
-
- 
-## Releases
-### Version 2.6  
- - [Changes since the previous version][58]
- - [New features][59]
- - [Migration notes][60]
- - [Download iTop 2.6.0-beta][61]
-
-
-### Version 2.5  
- - [Changes since the previous version][54]
- - [New features][55]
- - [Migration notes][56]
- - [Download iTop 2.5.0][57]
- 
-
-### Version 2.4  
- - [Changes since the previous version][50]
- - [New features][51]
- - [Migration notes][52]
- - [Download iTop 2.4.1][53]
-
-
-# About Us
-
-iTop development is sponsored, led and supported by [Combodo][0].
-
-
-# Contributors
-
-We would like to give a special thank you to the people from the community who contributed to this project, including:
- - Alves, David
- - Beck, Pedro
- - Bilger, Jean-François
- - Bostoen, Jeffrey
- - Cardoso, Anderson
- - Cassaro, Bruno
- - Casteleyn, Thomas
- - Castro, Randall Badilla
- - Colantoni, Maria Laura
- - Dvořák, Lukáš
- - Goethals, Stefan
- - Gumble, David
- - Hippler, Lars
- - Khamit, Shamil
- - Konečný, Kamil
- - Kunin, Vladimir
- - Lassiter, Dennis
- - Lucas, Jonathan
- - Malik, Remie
- - Rosenke, Stephan
- - Seki, Shoji
- - Shilov, Vladimir
- - Tulio, Marco
- - Turrubiates, Miguel
-
-#### Aliases
- - chifu1234
- - cprobst
- - jbostoen
- - Karkoff1212
- - larhip
- - Laura
- - Purple Grape
- - Schlobinux
- - theBigOne
- - ulmerspatz
-
-#### Companies
- - Hardis
- - ITOMIG
-
-
-
-[0]: https://www.combodo.com
-
-[1]: https://sourceforge.net/p/itop/discussion/
-[2]: https://sourceforge.net/p/itop/tickets/
-[3]: https://sourceforge.net/projects/itop/files/itop/
-[4]: https://www.itophub.io/wiki
-[5]: https://store.itophub.io/en_US/
-
-
-
-[10]: https://www.itophub.io/wiki/page?id=2_5_0%3Adatamodel%3Astart#configuration_management_cmdb
-[11]: https://www.itophub.io/wiki/page?id=2_5_0%3Adatamodel%3Astart#ticketing
-[12]: https://www.itophub.io/wiki/page?id=2_5_0%3Adatamodel%3Astart#service_management
-[13]: https://www.itophub.io/wiki/page?id=2_5_0%3Adatamodel%3Astart#change_management
-[14]: https://www.itophub.io/wiki/page?id=2_5_0%3Aimplementation%3Astart#service_level_agreements_and_targets
-[15]: https://www.itophub.io/wiki/page?id=2_5_0%3Auser%3Aactions#relations
-[16]: https://www.itophub.io/wiki/page?id=2_5_0%3Auser%3Abulk_modify#uploading_data
-[17]: https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Aaudit
-[18]: https://www.itophub.io/wiki/page?id=2_5_0%3Aadvancedtopics%3Adata_synchro_overview
-
-
-
-[50]: https://www.itophub.io/wiki/page?id=2_4_0:release:change_log
-[51]: https://www.itophub.io/wiki/page?id=2_4_0:release:2_4_whats_new
-[52]: https://www.itophub.io/wiki/page?id=2_4_0:install:230_to_240_migration_notes
-[53]: https://sourceforge.net/projects/itop/files/itop/2.4.1/iTop-2.4.1-3714.zip/download
-
-[54]: https://www.itophub.io/wiki/page?id=2_5_0:release:change_log
-[55]: https://www.itophub.io/wiki/page?id=2_5_0:release:2_5_whats_new
-[56]: https://www.itophub.io/wiki/page?id=2_5_0:install:240_to_250_migration_notes
-[57]: https://sourceforge.net/projects/itop/files/itop/2.5.0/iTop-2.5.0-3935.zip/download
-
-[58]: https://www.itophub.io/wiki/page?id=2_6_0:release:change_log
-[59]: https://www.itophub.io/wiki/page?id=2_6_0:release:2_6_whats_new
-[60]: https://www.itophub.io/wiki/page?id=2_6_0:install:250_to_260_migration_notes
-[61]: https://sourceforge.net/projects/itop/files/itop/2.6.0-beta/iTop-2.6-beta-4146.zip/download
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -75,8 +75,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name','description'));
+		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
 	}

 	protected static $m_aCacheProfiles = null;
@@ -200,12 +200,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	// preserve DB integrity by deleting links to users
 	protected function OnDelete()
 	{
-		// Don't remove admin profile
-		if ($this->Get('name') === ADMIN_PROFILE_NAME)
-		{
-			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
-		}
-
 		// Note: this may break the rule that says: "a user must have at least ONE profile" !
 		$oLnkSet = $this->Get('user_list');
 		while($oLnk = $oLnkSet->Fetch())
@@ -303,38 +297,13 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 		$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
 	}

-	/**
-	 * @param $iActionCode
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \SecurityException
-	 */
 	protected function CheckIfProfileIsAllowed($iActionCode)
 	{
-		// When initializing or admin, we need to let everything pass trough
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
-
-		// Only administrators can manage administrators
-		$iOrigUserId = $this->GetOriginal('userid');
-		if (!empty($iOrigUserId))
-		{
-			$oUser = MetaModel::GetObject('User', $iOrigUserId, true, true);
-			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
-			{
-				throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
-			}
-		}
-		$oUser = MetaModel::GetObject('User', $this->Get('userid'), true, true);
-		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
-		{
-			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
-		}
 		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this)))
 		{
 			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
 		}
-		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
+		if (UserRights::IsLoggedIn() && !UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
 		{
 			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
 		}
@@ -380,42 +349,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 	{
 		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
 	}
-
-
-	protected function OnInsert()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	protected function OnUpdate()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	protected function OnDelete()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	/**
-	 * @throws \CoreException
-	 */
-	protected function CheckIfOrgIsAllowed()
-	{
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
-
-		$oUser = UserRights::GetUserObject();		
-		$oAddon = UserRights::GetModuleInstance();
-		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
-		if (count($aOrgs) > 0)
-		{
-			$iOrigOrgId = $this->GetOriginal('allowed_org_id');
-			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs))
-			{
-				throw new SecurityException(Dict::Format('Class:User/Error:OrganizationNotAllowed'));
-			}
-		}
-	}
 }


--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -97,8 +97,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
+		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
 	}

 	protected $m_bCheckReservedNames = true;
--- a/addons/userrights/userrightsprojection.class.inc.php
+++ b/addons/userrights/userrightsprojection.class.inc.php
@@ -78,8 +78,8 @@ class URP_Profiles extends UserRightsBaseClass
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
+		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
 	}

 	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -244,18 +244,9 @@ EOF
        //echo $this->s_deferred_content;
        if (count($this->a_scripts) > 0)
        {
-        	echo "<script type=\"text/javascript\">\n";
-        	echo implode("\n", $this->a_scripts);
-        	echo "\n</script>\n";
-        }
-        if (count($this->a_linked_scripts) > 0)
-        {
-        	echo "<script type=\"text/javascript\">\n";
-        	foreach($this->a_linked_scripts as $sScriptUrl)
-        	{
-        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
-        	}
-        	echo "\n</script>\n";
+            echo "<script type=\"text/javascript\">\n";
+            echo implode("\n", $this->a_scripts);
+            echo "\n</script>\n";
        }
        if (!empty($this->s_deferred_content))
        {
@@ -269,16 +260,6 @@ EOF
 	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
 	        echo "\n</script>\n";
        }
-        if(count($this->a_linked_stylesheets) > 0)
-        {
-        	echo "<script type=\"text/javascript\">";
-        	foreach($this->a_linked_stylesheets as $aStylesheet)
-	        {
-		        $sStylesheetUrl = $aStylesheet['link'];
-	        	echo "if (!$('link[href=\"{$sStylesheetUrl}\"]').length) $('<link href=\"{$sStylesheetUrl}\" rel=\"stylesheet\">').appendTo('head');\n";
-	        }
-        	echo "\n</script>\n";
-        }
        
 		if (trim($s_captured_output) != "")
        {
--- a/application/applicationcontext.class.inc.php
+++ b/application/applicationcontext.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2018 Combodo SARL
+// Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
 * Class ApplicationContext
 *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

@@ -31,12 +31,6 @@ require_once(APPROOT."/application/utils.inc.php");
 */ 
 interface iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     */
 	public static function MakeObjectURL($sClass, $iId);
 }

@@ -45,13 +39,6 @@ interface iDBObjectURLMaker
 */ 
 class iTopStandardURLMaker implements iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     * @throws \Exception
-     */
 	public static function MakeObjectURL($sClass, $iId)
 	{
 		$sPage = DBObject::ComputeStandardUIPage($sClass);
@@ -66,13 +53,6 @@ class iTopStandardURLMaker implements iDBObjectURLMaker
 */ 
 class PortalURLMaker implements iDBObjectURLMaker
 {
-    /**
-     * @param string $sClass
-     * @param string $iId
-     *
-     * @return string
-     * @throws \Exception
-     */
 	public static function MakeObjectURL($sClass, $iId)
 	{
 		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
@@ -94,20 +74,10 @@ class PortalURLMaker implements iDBObjectURLMaker
 */
 class ApplicationContext
 {
-    public static $m_sUrlMakerClass = null;
-    protected static $m_aPluginProperties = null;
-    protected static $aDefaultValues; // Cache shared among all instances
-
 	protected $aNames;
 	protected $aValues;
+	protected static $aDefaultValues; // Cache shared among all instances
 	
-    /**
-     * ApplicationContext constructor.
-     *
-     * @param bool $bReadContext
-     *
-     * @throws \Exception
-     */
 	public function __construct($bReadContext = true)
 	{
 		$this->aNames = array(
@@ -120,12 +90,10 @@ class ApplicationContext

 	}
 	
-    /**
-     * Read the context directly in the PHP parameters (either POST or GET)
-     * return nothing
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Read the context directly in the PHP parameters (either POST or GET)
+	 * return nothing
+	 */
 	protected function ReadContext()
 	{
 		if (!isset(self::$aDefaultValues))
@@ -142,26 +110,20 @@ class ApplicationContext
 				}
 				// Hmm, there must be a better (more generic) way to handle the case below:
 				// When there is only one possible (allowed) organization, the context must be
-				// fixed to this org unless there is only one organization in the system then
-				// no filter is applied
+				// fixed to this org
 				if ($sName == 'org_id')
 				{
 					if (MetaModel::IsValidClass('Organization'))
 					{
 						$oSearchFilter = new DBObjectSearch('Organization');
+						$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 						$oSet = new CMDBObjectSet($oSearchFilter);
-						$iCount = $oSet->CountWithLimit(2);
-						if ($iCount > 1)
+						$iCount = $oSet->Count();
+						if ($iCount == 1)
 						{
-							$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-							$oSet = new CMDBObjectSet($oSearchFilter);
-							$iCount = $oSet->CountWithLimit(2);
-							if ($iCount == 1)
-							{
-								// Only one possible value for org_id, set it in the context
-								$oOrg = $oSet->Fetch();
-								self::$aDefaultValues[$sName] = $oOrg->GetKey();
-							}
+							// Only one possible value for org_id, set it in the context
+							$oOrg = $oSet->Fetch();
+							self::$aDefaultValues[$sName] = $oOrg->GetKey();
 						}
 					}					
 				}
@@ -170,14 +132,11 @@ class ApplicationContext
 		$this->aValues = self::$aDefaultValues;
 	}
 	
-    /**
-     * Returns the current value for the given parameter
-     *
-     * @param string $sParamName Name of the parameter to read
-     * @param string $defaultValue
-     *
-     * @return mixed The value for this parameter
-     */
+	/**
+	 * Returns the current value for the given parameter
+	 * @param string $sParamName Name of the parameter to read
+	 * @return mixed The value for this parameter
+	 */
 	public function GetCurrentValue($sParamName, $defaultValue = '')
 	{
 		if (isset($this->aValues[$sParamName]))
@@ -189,7 +148,7 @@ class ApplicationContext
 	
 	/**
 	 * Returns the context as string with the format name1=value1&name2=value2....
-	 * @return string The context as a string to be appended to an href property
+	 * return string The context as a string to be appended to an href property
 	 */
 	public function GetForLink()
 	{
@@ -203,7 +162,7 @@ class ApplicationContext
 	
 	/**
 	 * Returns the context as sequence of input tags to be inserted inside a <form> tag
-	 * @return string The context as a sequence of <input type="hidden" /> tags
+	 * return string The context as a sequence of <input type="hidden" /> tags
 	 */
 	public function GetForForm()
 	{
@@ -217,7 +176,7 @@ class ApplicationContext

 	/**
 	 * Returns the context as a hash array 'parameter_name' => value
-	 * @return array The context information
+	 * return array The context information
 	 */
 	public function GetAsHash()
 	{
@@ -241,6 +200,7 @@ class ApplicationContext
 	 * Removes the specified parameter from the context, for example when the same parameter
 	 * is already a search parameter
 	 * @param string $sParamName Name of the parameter to remove	 	 
+	 * @return none
 	 */	
 	public function Reset($sParamName)
 	{
@@ -252,11 +212,6 @@ class ApplicationContext

 	/**
 	 * Initializes the given object with the default values provided by the context
-	 *
-	 * @param \DBObject $oObj
-	 *
-	 * @throws \Exception
-	 * @throws \CoreUnexpectedValue
 	 */
 	public function InitObjectFromContext(DBObject &$oObj)
 	{
@@ -284,10 +239,12 @@ class ApplicationContext
 		}		
 	}
 	
+	static $m_sUrlMakerClass = null;
+
 	/**
 	 * Set the current application url provider
-	 * @param string $sClass Class implementing iDBObjectURLMaker
-	 * @return string
+	 * @param sClass string Class implementing iDBObjectURLMaker	 
+	 * @return void
 	 */
 	public static function SetUrlMakerClass($sClass = 'iTopStandardURLMaker')
 	{
@@ -321,14 +278,7 @@ class ApplicationContext

 	/**
 	 * Get the current application url provider
-	 *
-	 * @param string $sObjClass
-	 * @param string $sObjKey
-	 * @param null $sUrlMakerClass
-	 * @param bool $bWithNavigationContext
-	 *
 	 * @return string the name of the class
-	 * @throws \Exception
 	 */
   public static function MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass = null, $bWithNavigationContext = true)
   {
@@ -356,6 +306,8 @@ class ApplicationContext
 		}	
 	}

+	protected static $m_aPluginProperties = null;
+
 	/**
 	 * Load plugin properties for the current session
 	 * @return void
@@ -374,9 +326,9 @@ class ApplicationContext

 	/**
 	 * Set plugin properties
-	 * @param string $sPluginClass Class implementing any plugin interface
-	 * @param string $sProperty Name of the property
-	 * @param mixed $value Value (numeric or string)
+	 * @param sPluginClass string Class implementing any plugin interface
+	 * @param sProperty string Name of the property
+	 * @param value scalar Value (numeric or string)
 	 * @return void
 	 */
 	public static function SetPluginProperty($sPluginClass, $sProperty, $value)
@@ -389,7 +341,7 @@ class ApplicationContext

 	/**
 	 * Get plugin properties
-	 * @param string $sPluginClass Class implementing any plugin interface
+	 * @param sPluginClass string Class implementing any plugin interface
 	 * @return array of sProperty=>value pairs
 	 */
 	public static function GetPluginProperties($sPluginClass)
@@ -407,3 +359,4 @@ class ApplicationContext
 	}

 }
+?>
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -16,8 +16,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>

-require_once(APPROOT.'application/newsroomprovider.class.inc.php');
-
 /**
 * Management of application plugins
 * 
@@ -124,8 +122,7 @@ interface iApplicationUIExtension
 	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
 	 * 
 	 * @param DBObject $oObject The object being displayed
-	 *
-	 * @return string[] desc
+	 * @return type desc
 	 */	
 	public function EnumUsedAttributes($oObject); // Not yet implemented

@@ -444,8 +441,7 @@ abstract class ApplicationPopupMenuItem
 	
 	/**
 	 * Returns the components to create a popup menu item in HTML
-	 *
-	 * @return array A hash array: array('label' => , 'url' => , 'target' => , 'onclick' => )
+	 * @return Hash A hash array: array('label' => , 'url' => , 'target' => , 'onclick' => )
 	 * @ignore	 	 
 	 */
 	abstract public function GetMenuItem();
@@ -763,15 +759,11 @@ interface iRestServiceProvider
 	 * @return array An array of hash 'verb' => verb, 'description' => description
 	 */
 	public function ListOperations($sVersion);
-
 	/**
 	 * Enumerate services delivered by this class
-	 *
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @param string $sVerb
-	 * @param array $aParams
-	 *
 	 * @return RestResult The standardized result structure (at least a message)
+	 * @throws Exception in case of internal failure.	 
 	 */
 	public function ExecOperation($sVersion, $sVerb, $aParams);
 }
@@ -873,8 +865,7 @@ class RestUtils
 	 * 	 
 	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 *
-	 * @return mixed parameter value if present
+	 * @return void
 	 * @throws Exception If the parameter is missing
 	 * @api
 	 */
@@ -897,8 +888,7 @@ class RestUtils
 	 * @param StdClass $oData Structured input data.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
 	 * @param mixed $default Default value if the parameter is not found in the input data
-	 *
-	 * @return mixed
+	 * @return void
 	 * @throws Exception
 	 * @api
 	 */
@@ -920,8 +910,7 @@ class RestUtils
 	 *
 	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 *
-	 * @return string
+	 * @return void
 	 * @throws Exception If the parameter is missing or the class is unknown
 	 * @api
 	 */
@@ -942,8 +931,7 @@ class RestUtils
 	 * @param string $sClass Name of the class
 	 * @param StdClass $oData Structured input data.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 *
-	 * @return array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
+	 * @return An array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
 	 * @throws Exception
 	 * @api
 	 */
@@ -1123,6 +1111,7 @@ class RestUtils
 		{
 			// OQL
 			$oSearch = DBObjectSearch::FromOQL($key);
+			$oObjectSet = new DBObjectSet($oSearch);
 		}
 		else
 		{
@@ -1171,14 +1160,6 @@ class RestUtils
 				}
 				$value = DBObjectSet::FromArray($sLnkClass, $aLinks);
 			}
-            elseif ($oAttDef instanceof AttributeTagSet)
-            {
-                if (!is_array($value))
-                {
-                    throw new Exception("A tag set must be defined by an array of tag codes");
-                }
-                $value = $oAttDef->FromJSONToValue($value);
-            }
 			else
 			{
 				$value = $oAttDef->FromJSONToValue($value);
--- a/application/audit.category.class.inc.php
+++ b/application/audit.category.class.inc.php
@@ -53,8 +53,8 @@ class AuditCategory extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'rules_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'definition_set')); // Criteria of the advanced search form
 	}
 }
 ?>
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -21,7 +21,6 @@ require_once(APPROOT.'application/dashlet.class.inc.php');
 require_once(APPROOT.'core/modelreflection.class.inc.php');

 /**
- *
 * A user editable dashboard page
 *
 * @copyright   Copyright (C) 2010-2017 Combodo SARL
@@ -50,11 +49,6 @@ abstract class Dashboard
 		$this->sId = $sId;
 	}

-	/**
-	 * @param $sXml
-	 *
-	 * @throws \Exception
-	 */
 	public function FromXml($sXml)
 	{
 		$this->aCells = array(); // reset the content of the dashboard
@@ -106,10 +100,10 @@ abstract class Dashboard
 			$oCellsList = $oCellsNode->getElementsByTagName('cell');
 			$aCellOrder = array();
 			$iCellRank = 0;
-			/** @var \DOMElement $oCellNode */
 			foreach($oCellsList as $oCellNode)
 			{
-				$oCellRank = $oCellNode->getElementsByTagName('rank')->item(0);
+				$aDashletList = array();
+				$oCellRank =  $oCellNode->getElementsByTagName('rank')->item(0);
 				if ($oCellRank)
 				{
 					$iCellRank = (float)$oCellRank->textContent;
@@ -119,7 +113,6 @@ abstract class Dashboard
 					$oDashletList = $oDashletsNode->getElementsByTagName('dashlet');
 					$iRank = 0;
 					$aDashletOrder = array();
-					/** @var \DOMElement $oDomNode */
 					foreach($oDashletList as $oDomNode)
 					{
 						$oRank =  $oDomNode->getElementsByTagName('rank')->item(0);
@@ -152,21 +145,17 @@ abstract class Dashboard
 		}
 	}

-	/**
-	 * @param \DOMElement $oDomNode
-	 *
-	 * @return mixed
-	 */
 	protected function InitDashletFromDOMNode($oDomNode)
    {
        $sId = $oDomNode->getAttribute('id');
-	    $sDashletType = $oDomNode->getAttribute('xsi:type');
+        $sClass = $oDomNode->getAttribute('xsi:type');

        // Test if dashlet can be instanciated, otherwise (uninstalled, broken, ...) we display a placeholder
-	    $sClass = static::GetDashletClassFromType($sDashletType);
-	    /** @var \Dashlet $oNewDashlet */
-	    $oNewDashlet = new $sClass($this->oMetaModel, $sId);
-        $oNewDashlet->SetDashletType($sDashletType);
+        if(!class_exists($sClass))
+        {
+            $sClass = 'DashletUnknown';
+        }
+        $oNewDashlet = new $sClass($this->oMetaModel, $sId);
        $oNewDashlet->FromDOMNode($oDomNode);

        return $oNewDashlet;
@@ -176,17 +165,8 @@ abstract class Dashboard
 	{
 		return ($aItem1['rank'] > $aItem2['rank']) ? +1 : -1;
 	}
-
 	/**
 	 * Error handler to turn XML loading warnings into exceptions
-	 *
-	 * @param $errno
-	 * @param $errstr
-	 * @param $errfile
-	 * @param $errline
-	 *
-	 * @return bool
-	 * @throws \DOMException
 	 */
 	public static function ErrorHandler($errno, $errstr, $errfile, $errline)
 	{
@@ -216,12 +196,8 @@ abstract class Dashboard
 		return $sXml;
 	}

-	/**
-	 * @param \DOMElement $oDefinition
-	 */
 	public function ToDOMNode($oDefinition)
 	{
-		/** @var \DOMDocument $oDoc */
 		$oDoc = $oDefinition->ownerDocument;

 		$oNode = $oDoc->createElement('layout', $this->sLayoutClass);
@@ -253,13 +229,12 @@ abstract class Dashboard
 			$iDashletRank = 0;
 			$oDashletsNode = $oDoc->createElement('dashlets');
 			$oCellNode->appendChild($oDashletsNode);
-			/** @var \Dashlet $oDashlet */
 			foreach ($aCell as $oDashlet)
 			{
 				$oNode = $oDoc->createElement('dashlet');
 				$oDashletsNode->appendChild($oNode);
 				$oNode->setAttribute('id', $oDashlet->GetID());
-				$oNode->setAttribute('xsi:type', $oDashlet->GetDashletType());
+				$oNode->setAttribute('xsi:type', get_class($oDashlet));
 				$oDashletRank = $oDoc->createElement('rank', $iDashletRank);
 				$oNode->appendChild($oDashletRank);
 				$iDashletRank++;
@@ -283,12 +258,8 @@ abstract class Dashboard
 			{
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
-				/** @var \Dashlet $oNewDashlet */
 				$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-				if (isset($aDashletParams['dashlet_type']))
-				{
-					$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
-				}
+				
 				$oForm = $oNewDashlet->GetForm();
 				$oForm->SetParamsContainer($sId);
 				$oForm->SetPrefix('');
@@ -346,9 +317,6 @@ abstract class Dashboard
 		$this->iAutoReloadSec = max(MetaModel::GetConfig()->Get('min_reload_interval'), (int)$iAutoReloadSec);
 	}

-	/**
-	 * @param \Dashlet $oDashlet
-	 */
 	public function AddDashlet($oDashlet)
 	{
 		$sId = $this->GetNewDashletId();
@@ -356,13 +324,19 @@ abstract class Dashboard
 		$this->aCells[] = array($oDashlet);
 	}
 	
-    /**
-     * @param \WebPage $oPage     *
-     * @param array $aExtraParams
-     *
-     * @throws \ReflectionException
-     */
-	public function RenderProperties($oPage, $aExtraParams = array())
+	public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+	{
+		$oPage->add('<h1>'.htmlentities(Dict::S($this->sTitle), ENT_QUOTES, 'UTF-8', false).'</h1>');
+		$oLayout = new $this->sLayoutClass;
+		$oLayout->Render($oPage, $this->aCells, $bEditMode, $aExtraParams);
+		if (!$bEditMode)
+		{
+			$oPage->add_linked_script('../js/dashlet.js');
+			$oPage->add_linked_script('../js/dashboard.js');
+		}
+	}
+	
+	public function RenderProperties($oPage)
 	{
 		// menu to pick a layout and edit other properties of the dashboard
 		$oPage->add('<div class="ui-widget-content ui-corner-all"><div class="ui-widget-header ui-corner-all" style="text-align:center; padding: 2px;">'.Dict::S('UI:DashboardEdit:Properties').'</div>');
@@ -391,7 +365,7 @@ abstract class Dashboard
 		$oField = new DesignerHiddenField('dashboard_id', '', $this->sId);
 		$oForm->AddField($oField);

-		$oField = new DesignerTextField('dashboard_title', Dict::S('UI:DashboardEdit:DashboardTitle'), $this->sTitle);
+		$oField = new DesignerLongTextField('dashboard_title', Dict::S('UI:DashboardEdit:DashboardTitle'), $this->sTitle);
 		$oForm->AddField($oField);

 		$oField = new DesignerBooleanField('auto_reload', Dict::S('UI:DashboardEdit:AutoReload'), $this->bAutoReload);
@@ -402,7 +376,7 @@ abstract class Dashboard
 		$oForm->AddField($oField);


-		$this->SetFormParams($oForm, $aExtraParams);
+		$this->SetFormParams($oForm);
 		$oForm->RenderAsPropertySheet($oPage, false, '.itop-dashboard');	

 		$oPage->add('</div>');
@@ -448,27 +422,7 @@ EOF
 		);
 	}
 	
-	/**
-	 * @param \iTopWebPage $oPage
-	 * @param bool $bEditMode
-	 * @param array $aExtraParams
-	 * @param bool $bCanEdit
-	 */
-	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
-	{
-		$oPage->add('<div class="dashboard-title-line"><div class="dashboard-title">'.htmlentities(Dict::S($this->sTitle), ENT_QUOTES, 'UTF-8', false).'</div></div>');
-
-		$oLayout = new $this->sLayoutClass;
-		/** @var \DashboardLayoutMultiCol $oLayout */
-		$oLayout->Render($oPage, $this->aCells, $bEditMode, $aExtraParams);
-		if (!$bEditMode)
-		{
-			$oPage->add_linked_script('../js/dashlet.js');
-			$oPage->add_linked_script('../js/dashboard.js');
-		}
-	}
-
-	public function RenderDashletsSelection(WebPage $oPage)
+	public function RenderDashletsSelection($oPage)
 	{
 		// Toolbox/palette to drag and drop dashlets
 		$oPage->add('<div class="ui-widget-content ui-corner-all"><div class="ui-widget-header ui-corner-all" style="text-align:center; padding: 2px;">'.Dict::S('UI:DashboardEdit:Dashlets').'</div>');
@@ -486,7 +440,7 @@ EOF
 		$oPage->add_ready_script("$('.dashlet_icon').draggable({helper: 'clone', appendTo: 'body', zIndex: 10000, revert:'invalid'});");
 	}
 	
-	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
+	public function RenderDashletsProperties($oPage)
 	{
 		// Toolbox/palette to edit the properties of each dashlet
 		$oPage->add('<div class="ui-widget-content ui-corner-all"><div class="ui-widget-header ui-corner-all" style="text-align:center; padding: 2px;">'.Dict::S('UI:DashboardEdit:DashletProperties').'</div>');
@@ -494,15 +448,15 @@ EOF
 		$oPage->add('<div id="dashlet_properties" style="text-align:center">');
 		foreach($this->aCells as $aCell)
 		{
-			/** @var \Dashlet $oDashlet */
 			foreach($aCell as $oDashlet)
 			{
 				$sId = $oDashlet->GetID();
+				$sClass = get_class($oDashlet);
 				if ($oDashlet->IsVisible())
 				{
 					$oPage->add('<div class="dashlet_properties" id="dashlet_properties_'.$sId.'" style="display:none">');
 					$oForm = $oDashlet->GetForm();
-					$this->SetFormParams($oForm, $aExtraParams);
+					$this->SetFormParams($oForm);
 					$oForm->RenderAsPropertySheet($oPage, false, '.itop-dashboard');		
 					$oPage->add('</div>');
 				}
@@ -517,7 +471,6 @@ EOF
 	 * Return an array of dashlets available for selection.
 	 *
 	 * @return array
-	 * @throws \ReflectionException
 	 */
 	protected function GetAvailableDashlets()
 	{
@@ -551,7 +504,6 @@ EOF
 		$iNewId = 0;
 		foreach($this->aCells as $aDashlets)
 		{
-			/** @var \Dashlet $oDashlet */
 			foreach($aDashlets as $oDashlet)
 			{
 				$iNewId = max($iNewId, (int)$oDashlet->GetID());
@@ -560,38 +512,12 @@ EOF
 		return $iNewId + 1;
 	}
 	
-    /**
-     * @param $oForm
-     * @param array $aExtraParams
-     *
-     * @return mixed
-     */
-	abstract protected function SetFormParams($oForm, $aExtraParams = array());
-
-	public static function GetDashletClassFromType($sType, $oFactory = null)
-	{
-		if (is_subclass_of($sType, 'Dashlet'))
-		{
-			return $sType;
-		}
-		return 'DashletUnknown';
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function GetId()
-	{
-		return $this->sId;
-	}
+	abstract protected function SetFormParams($oForm);
 }

 class RuntimeDashboard extends Dashboard
 {
 	protected $bCustomized;
-	private $sDefinitionFile = '';
-	private $sReloadURL = null;
-

 	public function __construct($sId)
 	{
@@ -605,16 +531,9 @@ class RuntimeDashboard extends Dashboard
 		$this->bCustomized = $bCustomized;
 	}
 	
-	/**
-	 * @param \DesignerForm $oForm
-	 *
-	 * @param array $aExtraParams
-	 *
-	 * @throws \Exception
-	 */
-	protected function SetFormParams($oForm, $aExtraParams = array())
+	protected function SetFormParams($oForm)
 	{
-		$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
+		$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property'));		
 	}
 	
 	public function Save()
@@ -659,264 +578,40 @@ class RuntimeDashboard extends Dashboard
 		}
 	}
 	
-	/**
-	 * @param string $sDashboardFile file name relative to the current module folder
-	 * @param string $sDashBoardId code of the dashboard either menu_id or <class>__<attcode>
-	 *
-	 * @return null|RuntimeDashboard
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function GetDashboard($sDashboardFile, $sDashBoardId)
-	{
-		$bCustomized = false;
-
-		if (!appUserPreferences::GetPref('display_original_dashboard_'.$sDashBoardId, false))
-		{
-			// Search for an eventual user defined dashboard
-			$oUDSearch = new DBObjectSearch('UserDashboard');
-			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-			$oUDSearch->AddCondition('menu_code', $sDashBoardId, '=');
-			$oUDSet = new DBObjectSet($oUDSearch);
-			if ($oUDSet->Count() > 0)
-			{
-				// Assuming there is at most one couple {user, menu}!
-				$oUserDashboard = $oUDSet->Fetch();
-				$sDashboardDefinition = $oUserDashboard->Get('contents');
-				$bCustomized = true;
-			}
-			else
-			{
-				$sDashboardDefinition = @file_get_contents($sDashboardFile);
-			}
-		}
-		else
-		{
-			$sDashboardDefinition = @file_get_contents($sDashboardFile);
-		}
-
-		if ($sDashboardDefinition !== false)
-		{
-			$oDashboard = new RuntimeDashboard($sDashBoardId);
-			$oDashboard->FromXml($sDashboardDefinition);
-			$oDashboard->SetCustomFlag($bCustomized);
-			$oDashboard->SetDefinitionFile($sDashboardFile);
-		}
-		else
-		{
-			$oDashboard = null;
-		}
-		return $oDashboard;
-	}
-
-	/**
-	 * @param \iTopWebPage $oPage
-	 * @param bool $bEditMode
-	 * @param array $aExtraParams (class and id of the current object
-	 *
-	 * @throws \Exception
-	 */
-	public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
-	{
-		if (!isset($aExtraParams['query_params']) && isset($aExtraParams['this->class']))
-		{
-			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
-			$aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
-		}
-		else
-		{
-			$aRenderParams = $aExtraParams;
-		}
-
-		parent::Render($oPage, $bEditMode, $aRenderParams);
-
-		if (isset($aExtraParams['query_params']['this->object()']))
-		{
-			/** @var \DBObject $oObj */
-			$oObj = $aExtraParams['query_params']['this->object()'];
-			$aAjaxParams = array('this->class' => get_class($oObj), 'this->id' => $oObj->GetKey());
-		}
-		else
-		{
-			$aAjaxParams = $aExtraParams;
-		}
-		if (!$bEditMode && !$oPage->IsPrintableVersion())
-		{
-			$sId = $this->GetId();
-			$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $sId);
-			if ($this->GetAutoReload())
-			{
-				$sFile = addslashes($this->GetDefinitionFile());
-				$sExtraParams = json_encode($aAjaxParams);
-				$iReloadInterval = 1000 * $this->GetAutoReloadInterval();
-				$sReloadURL = $this->GetReloadURL();
-				$oPage->add_script(
-<<<EOF
-				if (typeof(AutoReloadDashboardId$sDivId) !== 'undefined')
-				{
-					clearInterval(AutoReloadDashboardId$sDivId);
-					delete AutoReloadDashboardId$sDivId;
-				}
-			
-				AutoReloadDashboardId$sDivId = setInterval("ReloadDashboard$sDivId();", $iReloadInterval);
-
-				function ReloadDashboard$sDivId()
-				{
-					// Do not reload when a dialog box is active
-					if (!($('.ui-dialog:visible').length > 0) && $('.dashboard_contents#$sDivId').is(':visible'))
-					{
-						$('.dashboard_contents#$sDivId').block();
-						$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-						   { operation: 'reload_dashboard', dashboard_id: '$sId', file: '$sFile', extra_params: $sExtraParams, reload_url: '$sReloadURL'},
-						   function(data){
-							 $('.dashboard_contents#$sDivId').html(data);
-							 $('.dashboard_contents#$sDivId').unblock();
-							}
-						 );
-					}
-				}
-EOF
-				);
-			}
-			else
-			{
-				$oPage->add_script(
-<<<EOF
-				if (typeof(AutoReloadDashboardId$sDivId) !== 'undefined')
-				{
-					clearInterval(AutoReloadDashboardId$sDivId);
-					delete AutoReloadDashboardId$sDivId;
-				}
-EOF
-				);
-			}
-
-			if ($bCanEdit)
-			{
-				$this->RenderSelector($oPage, $aAjaxParams);
-				$this->RenderEditionTools($oPage, $aAjaxParams);
-			}
-		}
-	}
-
-	/**
-	 * @param \iTopWebPage $oPage
-	 * @param array $aAjaxParams
-	 */
-	protected function RenderSelector($oPage, $aAjaxParams = array())
-	{
-		$sId = $this->GetId();
-		$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $sId);
-		$sExtraParams = json_encode($aAjaxParams);
-
-		$sSelectorHtml = '<div class="dashboard-selector">';
-		if ($this->HasCustomDashboard())
-		{
-			$bStandardSelected = appUserPreferences::GetPref('display_original_dashboard_'.$sId, false);
-			$sStandard = Dict::S('UI:Toggle:StandardDashboard');
-			$sSelectorHtml .= '<div class="selector-label">'.$sStandard.'</div>';
-			$sSelectorHtml .= '<label class="switch"><input type="checkbox" onchange="ToggleDashboardSelector'.$sDivId.'();" '.($bStandardSelected ? '' : 'checked').'><span class="slider round"></span></label></input></label>';
-			$sCustom = Dict::S('UI:Toggle:CustomDashboard');
-			$sSelectorHtml .= '<div class="selector-label">'.$sCustom.'</div>';
-
-		}
-		$sSelectorHtml .= '</div>';
-		$sSelectorHtml = addslashes($sSelectorHtml);
-		$sFile = addslashes($this->GetDefinitionFile());
-		$sReloadURL = $this->GetReloadURL();
-
-		$oPage->add_ready_script(
-<<<EOF
-	$('.dashboard-title').after('$sSelectorHtml');
-EOF
-		);
-
-		$oPage->add_script(
-<<<EOF
-			function ToggleDashboardSelector$sDivId()
-			{
-				$('.dashboard_contents#$sDivId').block();
-				$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-				   { operation: 'toggle_dashboard', dashboard_id: '$sId', file: '$sFile', extra_params: $sExtraParams, reload_url: '$sReloadURL' },
-				   function(data) {
-					 $('.dashboard_contents#$sDivId').html(data);
-					 $('.dashboard_contents#$sDivId').unblock();
-					}
-				 );
-			}
-EOF
-		);
-	}
-
-	protected function HasCustomDashboard()
-	{
-		try
-		{
-			// Search for an eventual user defined dashboard
-			$oUDSearch = new DBObjectSearch('UserDashboard');
-			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-			$oUDSearch->AddCondition('menu_code', $this->GetId(), '=');
-			$oUDSet = new DBObjectSet($oUDSearch);
-
-			return ($oUDSet->Count() > 0);
-		}
-		catch (Exception $e)
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * @param \WebPage $oPage
-	 * @param array $aExtraParams
-	 *
-	 * @throws \Exception
-	 */
-	protected function RenderEditionTools(WebPage $oPage, $aExtraParams)
+	public function RenderEditionTools($oPage)
 	{
 		$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 = "<td><span id=\"DashboardMenu\"><ul><li><img src=\"../images/pencil-menu.png\"><ul>";
 	
 		$aActions = array();
-		$sFile = addslashes($this->sDefinitionFile);
-		$sJSExtraParams = json_encode($aExtraParams);
-		$bCanEdit = true;
-		if ($this->HasCustomDashboard())
-		{
-			$bCanEdit = !appUserPreferences::GetPref('display_original_dashboard_'.$this->GetId(), false);
-		}
-		if ($bCanEdit)
-		{
-			$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:Edit'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
-			$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
-		}
+		$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:Edit'), "return EditDashboard('{$this->sId}')");
+		$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();

 		if ($this->bCustomized)
 		{
 			$oRevert = new JSPopupMenuItem('UI:Dashboard:RevertConfirm', Dict::S('UI:Dashboard:Revert'),
-											"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
+											"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}'); else return false");
 			$aActions[$oRevert->GetUID()] = $oRevert->GetMenuItem();
 		}
 		utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_DASHBOARD_ACTIONS, $this, $aActions);
 		$sEditMenu .= $oPage->RenderPopupMenuItems($aActions);
+				
+
 		$sEditMenu = addslashes($sEditMenu);
-		$sReloadURL = $this->GetReloadURL();
+		//$sEditBtn = addslashes('<div style="display: inline-block; height: 55px; width:200px;vertical-align:center;line-height:60px;text-align:left;"><button onclick="EditDashboard(\''.$this->sId.'\');">Edit This Page</button></div>');
 		$oPage->add_ready_script(
 <<<EOF
-	$('.dashboard-title').after('$sEditMenu');
+	$('#logOffBtn').parent().before('$sEditMenu');
 	$('#DashboardMenu>ul').popupmenu();
 	
 EOF
 		);
 		$oPage->add_script(
 <<<EOF
-function EditDashboard(sId, sDashboardFile, aExtraParams)
+function EditDashboard(sId)
 {
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'dashboard_editor', id: sId, file: sDashboardFile, extra_params: aExtraParams, reload_url: '$sReloadURL'},
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'dashboard_editor', id: sId},
 		function(data)
 		{
 			$('body').append(data);
@@ -924,12 +619,12 @@ function EditDashboard(sId, sDashboardFile, aExtraParams)
 	);
 	return false;
 }
-function RevertDashboard(sId, aExtraParams)
+function RevertDashboard(sId)
 {
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'revert_dashboard', dashboard_id: sId, extra_params: aExtraParams, reload_url: '$sReloadURL'},
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'revert_dashboard', dashboard_id: sId},
 		function(data)
 		{
-			location.reload();
+			$('body').append(data);
 		}
 	);
 	return false;
@@ -938,14 +633,9 @@ EOF
 		);
 	}

-	/**
-	 * @param \WebPage $oPage
-	 *
-	 * @throws \ReflectionException
-	 */
-	public function RenderProperties($oPage, $aExtraParams = array())
+	public function RenderProperties($oPage)
 	{
-		parent::RenderProperties($oPage, $aExtraParams);
+		parent::RenderProperties($oPage);

 		$oPage->add_ready_script(
 <<<EOF
@@ -976,36 +666,16 @@ EOF
 	}


-	/**
-	 * @param \iTopWebPage $oPage
-	 *
-	 * @param array $aExtraParams
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \ReflectionException
-	 * @throws \Exception
-	 */
-	public function RenderEditor($oPage, $aExtraParams = array())
+	public function RenderEditor($oPage)
 	{
-		if (isset($aExtraParams['this->class']))
-		{
-			$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
-			$aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
-		}
-		else
-		{
-			$aRenderParams = $aExtraParams;
-		}
-		$sJSExtraParams = json_encode($aExtraParams);
 		$oPage->add('<div id="dashboard_editor">');
 		$oPage->add('<div class="ui-layout-center">');
-		$this->Render($oPage, true, $aRenderParams);
+		$this->Render($oPage, true);
 		$oPage->add('</div>');
 		$oPage->add('<div class="ui-layout-east">');
-		$this->RenderProperties($oPage, $aExtraParams);
+		$this->RenderProperties($oPage);
 		$this->RenderDashletsSelection($oPage);
-		$this->RenderDashletsProperties($oPage, $aExtraParams);
+		$this->RenderDashletsProperties($oPage);
 		$oPage->add('</div>');
 		$oPage->add('<div id="event_bus"/>'); // For exchanging messages between the panes, same as in the designer
 		$oPage->add('</div>');
@@ -1019,9 +689,7 @@ EOF
 		$sAutoReload = $this->bAutoReload ? 'true' : 'false';
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
 		$sTitle = addslashes($this->sTitle);
-		$sFile = addslashes($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
-		$sReloadURL = $this->GetReloadURL();

 		$sExitConfirmationMessage = addslashes(Dict::S('UI:NavigateAwayConfirmationMessage'));
 		$sCancelConfirmationMessage = addslashes(Dict::S('UI:CancelConfirmationMessage'));
@@ -1051,7 +719,7 @@ $('#dashboard_editor').dialog({
 			}
 		}
 		window.bLeavingOnUserAction = true;
-		oDashboard.save($(this));
+		oDashboard.save();
 	} },
 	{ text: "$sCancelButtonLabel", click: function() {
 		var oDashboard = $('.itop-dashboard').data('itopRuntimedashboard');
@@ -1073,8 +741,8 @@ $('#dashboard_editor').dialog({
 $('#dashboard_editor .ui-layout-center').runtimedashboard({
 	dashboard_id: '$sId', layout_class: '$sLayoutClass', title: '$sTitle',
 	auto_reload: $sAutoReload, auto_reload_sec: $sAutoReloadSec,
-	submit_to: '$sUrl', submit_parameters: {operation: 'save_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
-	render_to: '$sUrl', render_parameters: {operation: 'render_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_to: '$sUrl', submit_parameters: {operation: 'save_dashboard'},
+	render_to: '$sUrl', render_parameters: {operation: 'render_dashboard'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });

@@ -1157,8 +825,7 @@ EOF
                    $sParentId = $aParentMenu['parent'];
                    $aParentMenu = $aParentMenus[$sParentId];
                }
-	            /** @var \MenuNode $oParentMenu */
-	            $oParentMenu = $aParentMenu['node'];
+                $oParentMenu = $aParentMenu['node'];
                if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled())
                {
                    $sMenuLabel = $oMenu->GetTitle();
@@ -1213,7 +880,6 @@ EOF
 		{
 			$oSubForm = new DesignerForm();
 			$oMetaModel = new ModelReflectionRuntime();
-			/** @var \Dashlet $oDashlet */
 			$oDashlet = new $sDashletClass($oMetaModel, 0);
 			$oDashlet->GetPropertiesFieldsFromOQL($oSubForm, $sOQL);
 			
@@ -1225,10 +891,6 @@ EOF
 		return $oForm;
 	}
 	
-	/**
-	 * @param \WebPage $oPage
-	 * @param $sOQL
-	 */
 	public static function GetDashletCreationDlgFromOQL($oPage, $sOQL)
 	{
 		$oPage->add('<div id="dashlet_creation_dlg">');
@@ -1275,30 +937,4 @@ $('#dashlet_creation_dlg').dialog({
 EOF
 		);
 	}
-
-	/**
-	 * @return string
-	 */
-	public function GetDefinitionFile()
-	{
-		return $this->sDefinitionFile;
-	}
-
-	/**
-	 * @param string $sDefinitionFile
-	 */
-	public function SetDefinitionFile($sDefinitionFile)
-	{
-		$this->sDefinitionFile = $sDefinitionFile;
-	}
-
-	public function GetReloadURL()
-	{
-		return $this->sReloadURL;
-	}
-
-	public function SetReloadURL($sReloadURL)
-	{
-		$this->sReloadURL = $sReloadURL;
-	}
 }
--- a/application/dashboardlayout.class.inc.php
+++ b/application/dashboardlayout.class.inc.php
@@ -59,7 +59,6 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		$bNoVisibleFound = true;
 		while($idx < count($aKeys) && $bNoVisibleFound)
 		{
-			/** @var \Dashlet $oDashlet */
 			$oDashlet = $aDashlets[$aKeys[$idx]];
 			if ($oDashlet->IsVisible())
 			{
@@ -100,12 +99,6 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 		
 	}
 	
-	/**
-	 * @param \WebPage $oPage
-	 * @param $aCells
-	 * @param bool $bEditMode
-	 * @param array $aExtraParams
-	 */
 	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = array())
 	{
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
@@ -129,7 +122,6 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 					$aDashlets = $aCells[$iCellIdx];
 					if (count($aDashlets) > 0)
 					{
-						/** @var \Dashlet $oDashlet */
 						foreach($aDashlets as $oDashlet)
 						{
 							if ($oDashlet->IsVisible())
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
  <portals>
    <portal id="legacy_portal" _delta="define">
      <url>portal/index.php</url>
--- a/application/datatable.class.inc.php
+++ b/application/datatable.class.inc.php
@@ -756,10 +756,6 @@ class DataTableSettings implements Serializable
 	{
 		foreach($this->aClassAliases as $sAlias => $sClass)
 		{
-			if (!isset($this->aColumns[$sAlias]))
-			{
-				continue;
-			}
 			foreach($this->aColumns[$sAlias] as $sAttCode => $aData)
 			{
 				// Remove non-existent columns
@@ -775,7 +771,7 @@ class DataTableSettings implements Serializable
 			$aTempData = array();
 			foreach($aList as $sAttCode => $oAttDef)
 			{
-				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!($oAttDef instanceof AttributeLinkedSet || $oAttDef instanceof AttributeDashboard)))
+				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!$oAttDef instanceof AttributeLinkSet))
 				{
 					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, $oAttDef, false /* bChecked */, 'none');
 					if ($aFieldData) $aTempData[$aFieldData['label']] = $aFieldData;
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -111,12 +111,8 @@ class DisplayBlock
 	
 	/**
 	 * Constructs a DisplayBlock object from an XML template
-	 *
 	 * @param $sTemplate string The XML template
-	 *
 	 * @return DisplayBlock The DisplayBlock object, or null if the template is invalid
-	 * @throws \ApplicationException
-	 * @throws \OQLException
 	 */
 	public static function FromTemplate($sTemplate)
 	{
@@ -126,6 +122,7 @@ class DisplayBlock
 		$aParams = array();
 		
 		if (($iStartPos === false) || ($iEndPos === false)) return null; // invalid template		
+		$sITopBlock = substr($sTemplate,$iStartPos, $iEndPos-$iStartPos+strlen('</'.self::TAG_BLOCK.'>'));
 		$sITopData = substr($sTemplate, 1+$iEndTag, $iEndPos - $iEndTag - 1);
 		$sITopTag = substr($sTemplate, $iStartPos + strlen('<'.self::TAG_BLOCK), $iEndTag - $iStartPos - strlen('<'.self::TAG_BLOCK));

@@ -146,6 +143,10 @@ class DisplayBlock
 		{
 			$sBlockClass = $aMatches[1];
 		}
+		if (preg_match('/ objectclass="(.*)"/U',$sITopTag, $aMatches))
+		{
+			$sObjectClass = $aMatches[1];
+		}
 		if (preg_match('/ encoding="(.*)"/U',$sITopTag, $aMatches))
 		{
 			$sEncoding = strtolower($aMatches[1]);
@@ -194,7 +195,6 @@ class DisplayBlock
 			}

 		}
-		$oFilter = null;
 		switch($sEncoding)
 		{
 			case 'text/serialize':
@@ -220,26 +220,9 @@ class DisplayBlock
 		$aExtraParams['currentId'] = $sId;
 		$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
 		
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		else
-		{
-			if (isset($aExtraParams['this->id']) && isset($aExtraParams['this->class']))
-			{
-				$sClass = $aExtraParams['this->class'];
-				$iKey = $aExtraParams['this->id'];
-				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
-			}
-			else
-			{
-				$aQueryParams = array();
-			}
-		}

-		$sFilter = addslashes($this->m_oFilter->serialize(false, $aQueryParams)); // Used either for asynchronous or auto_reload
+
+		$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
 		if (!$this->m_bAsynchronous)
 		{
 			// render now
@@ -331,31 +314,19 @@ class DisplayBlock
 	 * @throws MySQLException
 	 * @throws Exception
 	 */
-	public function GetRenderContent(WebPage $oPage, $aExtraParams, $sId)
+	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
 	{
 		$sHtml = '';
 		// Add the extra params into the filter if they make sense for such a filter
 		$bDoSearch = utils::ReadParam('dosearch', false);
-		$aQueryParams = array();
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		else
-		{
-			if (isset($aExtraParams['this->id']) && isset($aExtraParams['this->class']))
-			{
-				$sClass = $aExtraParams['this->class'];
-				$iKey = $aExtraParams['this->id'];
-				$oObj = MetaModel::GetObject($sClass, $iKey);
-				$aQueryParams = array('this->object()' => $oObj);
-			}
-		}
 		if ($this->m_oSet == null)
 		{
-
-			// In case of search, the context filtering is done by the search itself
-			if (($this->m_sStyle != 'links') && ($this->m_sStyle != 'search') && ($this->m_sStyle != 'list_search'))
+			$aQueryParams = array();
+			if (isset($aExtraParams['query_params']))
+			{
+				$aQueryParams = $aExtraParams['query_params'];
+			}
+			if ($this->m_sStyle != 'links')
 			{
 				$oAppContext = new ApplicationContext();
 				$sClass = $this->m_oFilter->GetClass();
@@ -457,7 +428,71 @@ class DisplayBlock
 			case 'count':
 			if (isset($aExtraParams['group_by']))
 			{
-				$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
+				$sAlias = $this->m_oFilter->GetClassAlias();
+				if (isset($aExtraParams['group_by_label']))
+				{
+					$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);					
+					$sGroupByLabel = $aExtraParams['group_by_label'];
+				}
+				else
+				{
+					// Backward compatibility: group_by is simply a field id
+					$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
+					$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
+				}
+
+				// Security filtering
+				$aFields = $oGroupByExp->ListRequiredFields();
+				foreach($aFields as $sFieldAlias)
+				{
+					if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
+					{
+						$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
+						$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
+						if ($oAttDef instanceof AttributeOneWayPassword)
+						{
+							throw new Exception('Grouping on password fields is not supported.');
+						}
+					}
+				}
+				
+				$aGroupBy = array();
+				$aGroupBy['grouped_by_1'] = $oGroupByExp;
+				$aQueryParams = array();
+				if (isset($aExtraParams['query_params']))
+				{
+					$aQueryParams = $aExtraParams['query_params'];
+				}
+				$aFunctions = array();
+				$aOrderBy = array();
+				$sAgregationFunction = 'count';
+				$sFctVar = '_itop_count_';
+				$sAgregationAttr = '';
+				if (isset($aExtraParams['agregation_function']) && !empty($aExtraParams['agregation_attribute']))
+				{
+					$sAgregationFunction = $aExtraParams['agregation_function'];
+					$sAgregationAttr = $aExtraParams['agregation_attribute'];
+					$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAgregationAttr.'`');
+					$oFctExpr = new FunctionExpression(strtoupper($sAgregationFunction), array($oAttrExpr));
+					$sFctVar = '_itop_'.$sAgregationFunction.'_';
+					$aFunctions = array($sFctVar => $oFctExpr);
+				}
+				if (!empty($sAgregationAttr))
+				{
+					$sClass = $this->m_oFilter->GetClass();
+					$sAgregationAttr = MetaModel::GetLabel($sClass, $sAgregationAttr);
+				}
+				$iLimit = 0;
+				if (isset($aExtraParams['limit']))
+				{
+					$iLimit = intval($aExtraParams['limit']);
+				}
+				if (isset($aExtraParams['order_direction']))
+				{
+					$aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
+				}
+
+				$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true, $aFunctions, $aOrderBy, $iLimit);

 				$aRes = CMDBSource::QueryToArray($sSql);

@@ -485,22 +520,14 @@ class DisplayBlock
 					$oSubsetSearch = $this->m_oFilter->DeepClone();
 					$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($aValues[$iRow]));
 					$oSubsetSearch->AddConditionExpression($oCondition);
-					if (isset($aExtraParams['query_params']))
-					{
-						$aQueryParams = $aExtraParams['query_params'];
-					}
-					else
-					{
-						$aQueryParams = array();
-					}
-					$sFilter = rawurlencode($oSubsetSearch->serialize(false, $aQueryParams));
+					$sFilter = urlencode($oSubsetSearch->serialize());

 					$aData[] = array ('group' => $aLabels[$iRow],
 									  'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"); // TO DO: add the context information
 				}
 				$aAttribs =array(
 					'group' => array('label' => $sGroupByLabel, 'description' => ''),
-					'value' => array('label'=> Dict::S('UI:GroupBy:'.$sAggregationFunction), 'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr))
+					'value' => array('label'=> Dict::S('UI:GroupBy:'.$sAgregationFunction), 'description' => Dict::Format('UI:GroupBy:'.$sAgregationFunction.'+', $sAgregationAttr))
 				);
 				$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
 				$sHtml .= $oPage->GetP(Dict::Format($sFormat, $iTotalCount));
@@ -616,7 +643,6 @@ class DisplayBlock
 			}
 			break;

-			case 'list_search':
 			case 'list':
 			$aClasses = $this->m_oSet->GetSelectedClasses();
 			$aAuthorizedClasses = array();
@@ -632,7 +658,7 @@ class DisplayBlock
 				}
 				if (count($aAuthorizedClasses) > 0)
 				{
-					if($this->m_oSet->CountWithLimit(1) > 0)
+					if($this->m_oSet->Count() > 0)
 					{
 						$sHtml .= cmdbAbstractObject::GetDisplayExtendedSet($oPage, $this->m_oSet, $aExtraParams);
 					}
@@ -651,7 +677,7 @@ class DisplayBlock
 			else
 			{
 				// The list is made of only 1 class of objects, actions on the list are possible
-				if ( ($this->m_oSet->CountWithLimit(1)> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
+				if ( ($this->m_oSet->Count()> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
 				{
 					$sHtml .= cmdbAbstractObject::GetDisplaySet($oPage, $this->m_oSet, $aExtraParams);
 				}
@@ -689,21 +715,16 @@ class DisplayBlock

 				if (isset($aExtraParams['update_history']) && true == $aExtraParams['update_history'])
 				{
-					$sSearchFilter = $this->m_oSet->GetFilter()->serialize();
-					// Limit the size of the URL (N°1585 - request uri too long)
-					if (strlen($sSearchFilter) < SERVER_MAX_URL_LENGTH)
-					{
-						$seventAttachedData = json_encode(array(
-							'filter' => $sSearchFilter,
-							'breadcrumb_id' => "ui-search-".$this->m_oSet->GetClass(),
-							'breadcrumb_label' => MetaModel::GetName($this->m_oSet->GetClass()),
-							'breadcrumb_max_count' => utils::GetConfig()->Get('breadcrumb.max_count'),
-							'breadcrumb_instance_id' => MetaModel::GetConfig()->GetItopInstanceid(),
-							'breadcrumb_icon' => utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png'
-						));

-						$oPage->add_ready_script("$('body').trigger('update_history.itop', [$seventAttachedData])");
-					}
+					$seventAttachedData = json_encode(array(
+						'filter'                => $this->m_oSet->GetFilter()->serialize(),
+						'breadcrumb_id'         => "ui-search-".$this->m_oSet->GetClass(),
+						'breadcrumb_label'      => MetaModel::GetName($this->m_oSet->GetClass()),
+						'breadcrumb_max_count'  => utils::GetConfig()->Get('breadcrumb.max_count'),
+						'breadcrumb_instance_id'=> MetaModel::GetConfig()->GetItopInstanceid(),
+						'breadcrumb_icon'       => utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png'
+					));
+					$oPage->add_ready_script("$('body').trigger('update_history.itop', [$seventAttachedData])");
 				}
 			}
 			break;
@@ -711,7 +732,7 @@ class DisplayBlock
 			case 'links':
 			//$bDashboardMode = isset($aExtraParams['dashboard']) ? ($aExtraParams['dashboard'] == 'true') : false;
 			//$bSelectMode = isset($aExtraParams['select']) ? ($aExtraParams['select'] == 'true') : false;
-			if ( ($this->m_oSet->CountWithLimit(1) > 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
+			if ( ($this->m_oSet->Count()> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
 			{
 				//$sLinkage = isset($aExtraParams['linkage']) ? $aExtraParams['linkage'] : '';
 				$sHtml .= cmdbAbstractObject::GetDisplaySet($oPage, $this->m_oSet, $aExtraParams);
@@ -727,6 +748,8 @@ class DisplayBlock
 				{
 					if ((UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
 					{
+						$oAppContext = new ApplicationContext();
+						$sParams = $oAppContext->GetForLink();
 						$sDefaults = '';
 						if (isset($this->m_aParams['default']))
 						{
@@ -752,8 +775,9 @@ class DisplayBlock
 			$sClass = $this->m_oFilter->GetClass();
 			$oAppContext = new ApplicationContext();
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
-			if ($bContextFilter && is_null($this->m_oSet))
+			if ($bContextFilter)
 			{
+				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($this->m_oFilter->GetClass()));
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
@@ -771,7 +795,7 @@ class DisplayBlock
 				$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
 			}
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize());
 			$sHtml .= '<p><a class="actions" href="'.$sHyperlink.'">';
 			// Note: border set to 0 due to various browser interpretations (IE9 adding a 2px border)
 			$sHtml .= MetaModel::GetClassIcon($sClass, true, 'float;left;margin-right:10px;border:0;');
@@ -797,6 +821,7 @@ class DisplayBlock
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
 			if ($bContextFilter)
 			{
+				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($this->m_oFilter->GetClass()));
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
@@ -822,15 +847,9 @@ class DisplayBlock
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sStateAttrCode);

 				// Generate one count + group by query [#1330]
-				$sClassAlias = $this->m_oFilter->GetClassAlias();
-				$oGroupByExpr = Expression::FromOQL($sClassAlias.'.'.$sStateAttrCode);
+				$oGroupByExpr = Expression::FromOQL($sClass.'.'.$sStateAttrCode);
 				$aGroupBy = array('group1' => $oGroupByExpr);
-				$oGroupBySearch = $this->m_oFilter->DeepClone();
-				if (isset($this->m_bShowObsoleteData))
-				{
-					$oGroupBySearch->SetShowObsoleteData($this->m_bShowObsoleteData);
-				}
-				$sCountGroupByQuery = $oGroupBySearch->MakeGroupByQuery(array(), $aGroupBy, false);
+				$sCountGroupByQuery = $this->m_oFilter->MakeGroupByQuery(array(), $aGroupBy, false);
 				$aCountGroupByResults = CMDBSource::QueryToArray($sCountGroupByQuery);
 				$aCountsQueryResults = array();
 				foreach ($aCountGroupByResults as $aCountGroupBySingleResult)
@@ -854,13 +873,9 @@ class DisplayBlock
 					{
 						$oSingleGroupByValueFilter = $this->m_oFilter->DeepClone();
 						$oSingleGroupByValueFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
-						if (isset($this->m_bShowObsoleteData))
-						{
-							$oSingleGroupByValueFilter->SetShowObsoleteData($this->m_bShowObsoleteData);
-						}
 						$sHyperlink = utils::GetAbsoluteUrlAppRoot()
 							.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
-							.'&filter='.rawurlencode($oSingleGroupByValueFilter->serialize());
+							.'&filter='.urlencode($oSingleGroupByValueFilter->serialize());
 						$aCounts[$sStateValue] = "<a href=\"$sHyperlink\">{$aCounts[$sStateValue]}</a>";
 					}
 				}
@@ -869,7 +884,7 @@ class DisplayBlock
 			$sHtml .= '<tr><td>'.implode('</td><td>', $aCounts).'</td></tr></table></div>';
 			// Title & summary
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize());
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize());
 			$sHtml .= '<h1>'.Dict::S(str_replace('_', ':', $sTitle)).'</h1>';
 			$sHtml .= '<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sLabel), $iCount).'</a>';
 			$sHtml .= '<div style="clear:both;"></div>';
@@ -880,7 +895,7 @@ class DisplayBlock

 			$sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv'; 
 			$sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($sCsvFile);
-			$sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
+			$sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize()).'&format=csv';
 			// Pass the parameters via POST, since expression may be very long
 			$aParamsToPost = array(
 				'expression' => $this->m_oFilter->ToOQL(true),
@@ -901,6 +916,36 @@ class DisplayBlock
 			}
 			$sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php';
 				
+/*
+			$sCSVData = cmdbAbstractObject::GetSetAsCSV($this->m_oSet, array('fields_advanced' => $bAdvancedMode));
+			$sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');
+			if ($sCharset == 'UTF-8')
+			{
+				$bLostChars = false;
+			}
+			else
+			{
+				$sConverted = @iconv('UTF-8', $sCharset, $sCSVData);
+				$sRestored = @iconv($sCharset, 'UTF-8', $sConverted);
+				$bLostChars = ($sRestored != $sCSVData);
+			}
+
+			if ($bLostChars)
+			{
+				$sCharsetNotice = "&nbsp;&nbsp;<span id=\"csv_charset_issue\">";
+				$sCharsetNotice .= '<img src="../images/error.png"  style="vertical-align:middle"/>';
+				$sCharsetNotice .= "</span>";
+
+				$sTip = "<p>".htmlentities(Dict::S('UI:CSVExport:LostChars'), ENT_QUOTES, 'UTF-8')."</p>";
+				$sTip .= "<p>".htmlentities(Dict::Format('UI:CSVExport:LostChars+', $sCharset), ENT_QUOTES, 'UTF-8')."</p>";
+				$oPage->add_ready_script("$('#csv_charset_issue').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+			}
+			else
+			{
+				$sCharsetNotice = '';
+			}
+
+*/
 			$sCharsetNotice = false;
 			$sHtml .= "<div>";
 			$sHtml .= '<table style="width:100%" class="transparent">';
@@ -950,25 +995,25 @@ class DisplayBlock
 	
 			$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
 			$sTitle = isset($aExtraParams['chart_title']) ? '<h1 style="text-align:center">'.htmlentities(Dict::S($aExtraParams['chart_title']), ENT_QUOTES, 'UTF-8').'</h1>' : '';
-			$sHtml = "$sTitle<div style=\"height:200px;width:100%\" class=\"dashboard_chart\" id=\"my_chart_$sId{$iChartCounter}\"><div style=\"height:200px;line-height:200px;vertical-align:center;text-align:center;width:100%\"><img src=\"../images/indicator.gif\"></div></div>\n";
+			$sHtml = "$sTitle<div style=\"height:200px;width:100%\" id=\"my_chart_$sId{$iChartCounter}\"><div style=\"height:200px;line-height:200px;vertical-align:center;text-align:center;width:100%\"><img src=\"../images/indicator.gif\"></div></div>\n";
 			$sGroupBy = isset($aExtraParams['group_by']) ? $aExtraParams['group_by'] : '';
 			$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
-			$sFilter = $this->m_oFilter->serialize(false, $aQueryParams);
+			$sFilter = $this->m_oFilter->serialize();
 			$oContext = new ApplicationContext();
 			$sContextParam = $oContext->GetForLink();
-			$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
-			$sAggregationAttr = isset($aExtraParams['aggregation_attribute']) ? $aExtraParams['aggregation_attribute'] : '';
+			$sAgregationFunction = isset($aExtraParams['agregation_function']) ? $aExtraParams['agregation_function'] : '';
+			$sAgregationAttr = isset($aExtraParams['agregation_attribute']) ? $aExtraParams['agregation_attribute'] : '';
 			$sLimit = isset($aExtraParams['limit']) ? $aExtraParams['limit'] : '';
 			$sOrderBy = isset($aExtraParams['order_by']) ? $aExtraParams['order_by'] : '';
 			$sOrderDirection = isset($aExtraParams['order_direction']) ? $aExtraParams['order_direction'] : '';

 			if (isset($aExtraParams['group_by_label']))
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[agregation_function]=$sAgregationFunction&params[agregation_attribute]=$sAgregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}
 			else
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".rawurlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[agregation_function]=$sAgregationFunction&params[agregation_attribute]=$sAgregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}

 			$oPage->add_ready_script(
@@ -987,7 +1032,47 @@ EOF

 			if (isset($aExtraParams['group_by']))
 			{
-				$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
+				$sAlias = $this->m_oFilter->GetClassAlias();
+				if (isset($aExtraParams['group_by_label']))
+				{
+					$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
+				}
+				else
+				{
+					// Backward compatibility: group_by is simply a field id
+					$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
+				}
+
+				$aGroupBy = array();
+				$aGroupBy['grouped_by_1'] = $oGroupByExp;
+				$aQueryParams = array();
+				if (isset($aExtraParams['query_params']))
+				{
+					$aQueryParams = $aExtraParams['query_params'];
+				}
+				$aFunctions = array();
+				$aOrderBy = array();
+				$sFctVar = '_itop_count_';
+				if (isset($aExtraParams['agregation_function']) && !empty($aExtraParams['agregation_attribute']))
+				{
+					$sAgregationFunction = $aExtraParams['agregation_function'];
+					$sAgregationAttr = $aExtraParams['agregation_attribute'];
+					$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAgregationAttr.'`');
+					$oFctExpr = new FunctionExpression(strtoupper($sAgregationFunction), array($oAttrExpr));
+					$sFctVar = '_itop_'.$sAgregationFunction.'_';
+					$aFunctions = array($sFctVar => $oFctExpr);
+				}
+				$iLimit = 0;
+				if (isset($aExtraParams['limit']))
+				{
+					$iLimit = intval($aExtraParams['limit']);
+				}
+				if (isset($aExtraParams['order_direction']))
+				{
+					$aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
+				}
+
+				$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true, $aFunctions, $aOrderBy, $iLimit);
 				$aRes = CMDBSource::QueryToArray($sSql);
 				$oContext = new ApplicationContext();
 				$sContextParam = $oContext->GetForLink();
@@ -1008,7 +1093,7 @@ EOF
 					$oSubsetSearch = $this->m_oFilter->DeepClone();
 					$oCondition = new BinaryExpression($oGroupByExp, '=', new ScalarExpression($sValue));
 					$oSubsetSearch->AddConditionExpression($oCondition);
-					$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".rawurlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
+					$aURLs[] = utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html&filter=".urlencode($oSubsetSearch->serialize()).'&'.$sContextParam;
 				}
 				$sJSURLs = json_encode($aURLs);
 			}
@@ -1024,9 +1109,9 @@ EOF
 				$sJSNames = json_encode($aNames);
 				
 				$sJson = json_encode($aValues);
+				$sJSCount = json_encode(Dict::S('UI:GroupBy:Count'));
 				$oPage->add_ready_script(
 <<<EOF
-
 var chart = c3.generate({
    bindto: d3.select('#my_chart_$sId'),
    data: {
@@ -1074,12 +1159,6 @@ var chart = c3.generate({
 	  }
 	}
 });
-
-if (typeof(charts) === "undefined")
-{
-  charts = [];
-}
-charts.push(chart);
 EOF
 				);
 				break;
@@ -1106,7 +1185,6 @@ var chart = c3.generate({
 			var aURLs = $sJSURLs;
 		    window.location.href= aURLs[d.index];
 		},
-		order: null,
    },
    legend: {
      show: true,
@@ -1118,12 +1196,6 @@ var chart = c3.generate({
 	  }
 	}
 });
-
-if (typeof(charts) === "undefined")
-{
-  charts = [];
-}
-charts.push(chart);
 EOF
 				);
 				break;				
@@ -1172,7 +1244,7 @@ EOF
 		}
 		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
 		{
-			$sFilter = addslashes(str_replace('"', "'", $this->m_oFilter->serialize())); // Used either for asynchronous or auto_reload
+			$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
 			$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them

 			$oPage->add_script('if (typeof window.oAutoReloadBlock == "undefined") {
@@ -1181,7 +1253,7 @@ EOF
 				if (typeof window.oAutoReloadBlock[\''.$sId.'\'] != "undefined") {
 				    clearInterval(window.oAutoReloadBlock[\''.$sId.'\']);
 				}
-				window.oAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \"'.$sFilter.'\", \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+				window.oAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}

 		return $sHtml;
@@ -1255,7 +1327,7 @@ EOF
 		// In all other cases, just add the condition directly
 		if (!$bConditionAdded)
 		{
-			$this->m_oFilter->AddCondition($sFilterCode, $condition, null); // Use the default 'loose' operator
+			$this->m_oFilter->AddCondition($sFilterCode, $condition, null, $bParseSearchString); // Use the default 'loose' operator
 		}
 	}
 	
@@ -1276,97 +1348,6 @@ EOF
 	{
 		return $this->m_oSet->Count();
 	}
-
-	/**
-	 * @param $aExtraParams
-	 * @param $oGroupByExp
-	 * @param $sGroupByLabel
-	 * @param $aGroupBy
-	 * @param $sAggregationFunction
-	 * @param $sFctVar
-	 * @param $sAggregationAttr
-	 * @param $sSql
-	 *
-	 * @throws \Exception
-	 */
-	protected function MakeGroupByQuery(&$aExtraParams, &$oGroupByExp, &$sGroupByLabel, &$aGroupBy, &$sAggregationFunction, &$sFctVar, &$sAggregationAttr, &$sSql)
-	{
-		$sAlias = $this->m_oFilter->GetClassAlias();
-		if (isset($aExtraParams['group_by_label']))
-		{
-			$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
-			$sGroupByLabel = $aExtraParams['group_by_label'];
-		}
-		else
-		{
-			// Backward compatibility: group_by is simply a field id
-			$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
-			$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
-		}
-
-		// Security filtering
-		$aFields = $oGroupByExp->ListRequiredFields();
-		foreach($aFields as $sFieldAlias)
-		{
-			$aMatches = array();
-			if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
-			{
-				$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
-				$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
-				if ($oAttDef instanceof AttributeOneWayPassword)
-				{
-					throw new Exception('Grouping on password fields is not supported.');
-				}
-			}
-		}
-
-		$aGroupBy = array();
-		$aGroupBy['grouped_by_1'] = $oGroupByExp;
-		$aQueryParams = array();
-		if (isset($aExtraParams['query_params']))
-		{
-			$aQueryParams = $aExtraParams['query_params'];
-		}
-		$aFunctions = array();
-		$sAggregationFunction = 'count';
-		$sFctVar = '_itop_count_';
-		$sAggregationAttr = '';
-		if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute']))
-		{
-			$sAggregationFunction = $aExtraParams['aggregation_function'];
-			$sAggregationAttr = $aExtraParams['aggregation_attribute'];
-			$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAggregationAttr.'`');
-			$oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), array($oAttrExpr));
-			$sFctVar = '_itop_'.$sAggregationFunction.'_';
-			$aFunctions = array($sFctVar => $oFctExpr);
-		}
-
-		if (!empty($sAggregationAttr))
-		{
-			$sClass = $this->m_oFilter->GetClass();
-			$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
-		}
-		$iLimit = 0;
-		if (isset($aExtraParams['limit']))
-		{
-			$iLimit = intval($aExtraParams['limit']);
-		}
-		$aOrderBy = array();
-		if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by']))
-		{
-			switch ($aExtraParams['order_by'])
-			{
-				case 'attribute':
-					$aOrderBy = array('grouped_by_1' => ($aExtraParams['order_direction'] === 'asc'));
-					break;
-				case 'function':
-					$aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
-					break;
-			}
-		}
-
-		$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true, $aFunctions, $aOrderBy, $iLimit);
-	}
 }

 /**
@@ -1441,7 +1422,7 @@ class HistoryBlock extends DisplayBlock
 			default:
 			if ($bTruncated)
 			{
-				$sFilter = htmlentities($this->m_oFilter->serialize(), ENT_QUOTES, 'UTF-8');
+				$sFilter = $this->m_oFilter->serialize();
 				$sHtml .= '<div id="history_container"><p>';
 				$sHtml .= Dict::Format('UI:TruncatedResults', $this->iLimitCount, $oSet->Count());
 				$sHtml .= ' ';
@@ -1555,6 +1536,7 @@ class MenuBlock extends DisplayBlock
 		$oReflectionClass = new ReflectionClass($sClass);
 		$oSet = new CMDBObjectSet($this->m_oFilter);
 		$sFilter = $this->m_oFilter->serialize();
+		$sFilterDesc = $this->m_oFilter->ToOql(true);
 		$aActions = array();
 		$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
 		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
@@ -1673,7 +1655,6 @@ class MenuBlock extends DisplayBlock
 					if ($bLocked && $bRawModifiedAllowed)
 					{
 						// Add a special menu to kill the lock, but only to allowed users who can also modify this object
-						/** @var array $aAllowedProfiles */
 						$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
 						$bCanKill = false;
 					
@@ -1742,6 +1723,7 @@ class MenuBlock extends DisplayBlock
 				$sTargetAttr = $aExtraParams['target_attr'];
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
 				$sTargetClass = $oAttDef->GetTargetClass();
+				$bIsDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
 				if ($bIsModifyAllowed) { $aActions['UI:Menu:Add'] = array ('label' => Dict::S('UI:Menu:Add'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}") + $aActionParams; }
 				if ($bIsBulkModifyAllowed) { $aActions['UI:Menu:Manage'] = array ('label' => Dict::S('UI:Menu:Manage'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}") + $aActionParams; }
 				//if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#") + $aActionParams; }
@@ -1758,7 +1740,7 @@ class MenuBlock extends DisplayBlock
 				// Do not perform time consuming computations if there are too may objects in the list
 				$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
 				
-				if ((count($aStates) > 0) && (($iLimit == 0) || ($oSet->CountWithLimit($iLimit + 1) < $iLimit)))
+				if ((count($aStates) > 0) && (($iLimit == 0) || ($oSet->Count() < $iLimit)))
 				{
 					// Life cycle actions may be available... if all objects are in the same state
 					//
@@ -1832,8 +1814,7 @@ class MenuBlock extends DisplayBlock
 				}
 			}
 		}
-		$param  =  null;
-		$iMenuId = null;
+					
 		// New extensions based on iPopupMenuItem interface 
 		switch($this->m_sStyle)
 		{
@@ -1866,6 +1847,10 @@ class MenuBlock extends DisplayBlock
 				}
 			}
 		}
+		else
+		{
+			$aShortcutActions = array();
+		}
 		
 		if (!$oPage->IsPrintableVersion())
 		{
@@ -1882,7 +1867,7 @@ class MenuBlock extends DisplayBlock

 			if ($this->m_sStyle == 'details')
 			{
-				$sSearchAction = "window.location=\"{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}\"";
+				$sSearchAction = "window.location=\"{$sRootUrl}pages/UI.php?operation=search_form&class=$sClass{$sContext}\"";
 				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), ENT_QUOTES, 'UTF-8')."\"><span class=\"search-button fa fa-search\" onclick='$sSearchAction'></span></div>";
 			}

@@ -1912,7 +1897,7 @@ class MenuBlock extends DisplayBlock
 	
 	/**
 	 * Appends a menu separator to the current list of actions
-	 * @param array $aActions The current actions list
+	 * @param Hash $aActions The current actions list
 	 * @return void
 	 */
 	protected function AddMenuSeparator(&$aActions)
--- a/application/forms.class.inc.php
+++ b/application/forms.class.inc.php
@@ -378,9 +378,9 @@ $('#$sDialogId').dialog({
 				}
 			}
 		} },
-		{ text: "$sCancelButtonLabel", click: function() { $(this).dialog( "close" ); $(this).remove(); } },
+		{ text: "$sCancelButtonLabel", click: function() { KillAllMenus(); $(this).dialog( "close" ); $(this).remove(); } },
 		],
-		close: function() { $(this).remove(); }
+		close: function() { KillAllMenus(); $(this).remove(); }
 	});
 	var oForm = $('#$sDialogId form');
 	var sFormId = oForm.attr('id');
@@ -682,7 +682,6 @@ class DesignerFormField
 	protected $sLabel;
 	protected $sCode;
 	protected $defaultValue;
-	/** @var \DesignerForm $oForm */
 	protected $oForm;
 	protected $bMandatory;
 	protected $bReadOnly;
@@ -709,10 +708,7 @@ class DesignerFormField
 		return $this->sCode;
 	}
 	
-    /**
-     * @param \DesignerForm $oForm
-     */
-	public function SetForm(\DesignerForm $oForm)
+	public function SetForm($oForm)
 	{
 		$this->oForm = $oForm;
 	}
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -50,9 +50,6 @@ class LoginWebPage extends NiceWebPage
 		self::$sHandlerClass = $sClass;
 	}

-	/**
-	 * @return \LoginWebPage
-	 */
 	public static function NewLoginWebPage()
 	{
 		return new self::$sHandlerClass;
@@ -198,7 +195,7 @@ class LoginWebPage extends NiceWebPage
 	 */	
 	public function ForgotPwdLink()
 	{
-		$sUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		$sUrl = '?loginop=forgot_pwd';
 		$sHtml = "<a href=\"$sUrl\" target=\"_blank\">".Dict::S('UI:Login:ForgotPwd')."</a>";
 		return $sHtml;
 	}
@@ -233,8 +230,7 @@ class LoginWebPage extends NiceWebPage
 		try
 		{
 			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
-            /** @var UserInternal $oUser */
-            $oUser = UserRights::GetUserObject();
+			$oUser = UserRights::GetUserObject();
 			if ($oUser == null)
 			{
 				throw new Exception(Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser));
@@ -258,12 +254,15 @@ class LoginWebPage extends NiceWebPage
 			$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');
+			if ($sFrom == '')
+			{
+				$sFrom = $sTo;
+			}
 			$oEmail->SetRecipientFrom($sFrom);
 			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject'));
 			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
@@ -303,9 +302,6 @@ class LoginWebPage extends NiceWebPage
 		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 		$sToken = utils::ReadParam('token', '', false, 'raw_data');

-		$sAuthUserForDisplay = utils::HtmlEntities($sAuthUser);
-		$sTokenForDisplay = utils::HtmlEntities($sToken);
-
 		UserRights::Login($sAuthUser); // Set the user's language
 		$oUser = UserRights::GetUserObject();

@@ -314,7 +310,7 @@ class LoginWebPage extends NiceWebPage
 		$this->add("<h1>".Dict::S('UI:ResetPwd-Title')."</h1>\n");
 		if ($oUser == null)
 		{
-			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUserForDisplay)."</p>\n");
+			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser)."</p>\n");
 		}
 		else
 		{
@@ -326,8 +322,7 @@ class LoginWebPage extends NiceWebPage
 			}
 			else
 			{
-				$sUserNameForDisplay = utils::HtmlEntities($oUser->GetFriendlyName());
-				$this->add("<p>".Dict::Format('UI:ResetPwd-Error-EnterPassword', $sUserNameForDisplay)."</p>\n");
+				$this->add("<p>".Dict::Format('UI:ResetPwd-Error-EnterPassword', $oUser->GetFriendlyName())."</p>\n");
 	
 				$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
 				$this->add_script(
@@ -350,8 +345,8 @@ EOF
 				$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></span></td></tr>\n");
 				$this->add("</table>\n");
 				$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_reset_pwd\" />\n");
-				$this->add("<input type=\"hidden\" name=\"auth_user\" value=\"".$sAuthUserForDisplay."\" />\n");
-				$this->add("<input type=\"hidden\" name=\"token\" value=\"".$sTokenForDisplay."\" />\n");
+				$this->add("<input type=\"hidden\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" />\n");
+				$this->add("<input type=\"hidden\" name=\"token\" value=\"".htmlentities($sToken, ENT_QUOTES, 'UTF-8')."\" />\n");
 				$this->add("</form>\n");
 				$this->add("</div\n");
 			}
@@ -385,7 +380,6 @@ EOF
 			{
 				// Trash the token and change the password
 				$oUser->Set('reset_pwd_token', '');
-				$oUser->AllowWrite(true);
 				$oUser->SetPassword($sNewPwd); // Does record the change into the DB
 	
 				$this->add("<p>".Dict::S('UI:ResetPwd-Ready')."</p>");
@@ -714,15 +708,10 @@ EOF
 	/**
 	 * Check if the user is already authentified, if yes, then performs some additional validations:
 	 * - if $bMustBeAdmin is true, then the user must be an administrator, otherwise an error is displayed
-	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected
-	 * to the portal
-	 *
+	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected to the portal
 	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
 	 * @param bool $bIsAllowedToPortalUsers Whether or not the current page is considered as part of the portal
 	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
-	 *
-	 * @return int|mixed|string
-	 * @throws \Exception
 	 */
 	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
 	{
@@ -731,15 +720,10 @@ EOF
 	}
 	
 	/**
-	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards
-	 * the desired "portal"
-	 *
+	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards the desired "portal"
 	 * @param string|null $sRequestedPortalId The requested "portal" interface, null for any
 	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
 	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
-	 *
-	 * @return int|mixed|string
-	 * @throws \Exception
 	 */
 	static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
 	{
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -84,11 +84,14 @@ class ApplicationMenu
 		{
 			// Build menus from module handlers
 			//
-			/** @var \ModuleHandlerApiInterface $oPHPClass */
-			foreach(MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass)
-            {
-                $oPHPClass::OnMenuCreation();
-            }
+			foreach(get_declared_classes() as $sPHPClass)
+			{
+				if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
+				{
+					$aCallSpec = array($sPHPClass, 'OnMenuCreation');
+					call_user_func($aCallSpec);
+				}
+			}

 			// Build menus from the menus themselves (e.g. the ShortcutContainerMenuNode will do that)
 			//
@@ -122,11 +125,9 @@ class ApplicationMenu
 	}

 	/**
-	 * Check whether a menu Id is enabled or not
-	 *
+	 * Check wether a menu Id is enabled or not
 	 * @param $sMenuId
-	 *
-	 * @throws \Exception
+	 * @throws DictExceptionMissingString
 	 */
 	static public function CheckMenuIdEnabled($sMenuId)
 	{
@@ -166,9 +167,7 @@ class ApplicationMenu
 			}
 			else
 			{
-				/** @var \MenuNode $oNode */
-				$oNode = self::$aMenusIndex[$iParentIndex]['node'];
-				$sParentId = $oNode->GetMenuId();
+				$sParentId = self::$aMenusIndex[$iParentIndex]['node']->GetMenuId();
 				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
 			}

@@ -182,9 +181,7 @@ class ApplicationMenu
 		else
 		{
 			// the menu already exists, let's combine the conditions that make it visible
-			/** @var \MenuNode $oNode */
-			$oNode = self::$aMenusIndex[$index]['node'];
-			$oNode->AddCondition($oMenuNode);
+			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
 		}

 		return $index;
@@ -201,7 +198,7 @@ class ApplicationMenu

 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param \iTopWebPage $oPage
+	 * @param $oPage
 	 * @param $aExtraParams
 	 * @throws DictExceptionMissingString
 	 */
@@ -211,7 +208,6 @@ class ApplicationMenu
 		// Sort the root menu based on the rank
 		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
 		$iAccordion = 0;
-		$iActiveAccordion = $iAccordion;
 		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
 		foreach(self::$aRootMenus as $aMenu)
 		{
@@ -225,18 +221,16 @@ class ApplicationMenu
 			$oPage->AddToMenu('</ul>');
 			if ($bActive)
 			{
-				$iActiveAccordion = $iAccordion;
+$oPage->add_ready_script(
+<<<EOF
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
+EOF
+				);
 			}
 			$oPage->AddToMenu('</div>');
 			$iAccordion++;
 		}
-
-		$oPage->add_ready_script(
-<<<EOF
-	// Accordion Menu
-	$("#accordion").css({display:'block'}).accordion({ header: "h3", heightStyle: "content", collapsible: true,  active: $iActiveAccordion, icons: false, animate: true }); // collapsible will be enabled once the item will be selected
-EOF
-		);
 	}

 	/**
@@ -270,7 +264,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
@@ -362,7 +356,6 @@ EOF
 	static public function GetMenuIndexById($sTitle)
 	{
 		$index = -1;
-		/** @var MenuNode[] $aMenu */
 		foreach(self::$aMenusIndex as $aMenu)
 		{
 			if ($aMenu['node']->GetMenuId() == $sTitle)
@@ -643,10 +636,7 @@ abstract class MenuNode
 					}
 					if ($this->m_aEnableActions[$index] != null)
 					{
-						// Menus access rights ignore the archive mode
-						utils::PushArchiveMode(false);
 						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
-						utils::PopArchiveMode();
 						if (!($iResult & $this->m_aEnableActionResults[$index]))
 						{
 							return false;
@@ -844,7 +834,7 @@ class OQLMenuNode extends MenuNode
 	
 	/**
 	 * Set some extra parameters to be passed to the display block to fine tune its appearence
-	 * @param array $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
+	 * @param Hash $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
 	 */
 	public function SetParameters($aParams)
 	{
@@ -957,7 +947,7 @@ class SearchMenuNode extends MenuNode
 	}

 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @return mixed|void
 	 * @throws DictExceptionMissingString
@@ -1061,9 +1051,7 @@ class NewObjectMenuNode extends MenuNode

 	/**
 	 * @param string[] $aExtraParams
-	 *
 	 * @return string
-	 * @throws \Exception
 	 */
 	public function GetHyperlink($aExtraParams)
 	{
@@ -1152,11 +1140,37 @@ class DashboardMenuNode extends MenuNode
 	 */
 	public function GetDashboard()
 	{
-		return RuntimeDashboard::GetDashboard($this->sDashboardFile, $this->sMenuId);
+		$sDashboardDefinition = @file_get_contents($this->sDashboardFile);		
+		if ($sDashboardDefinition !== false)
+		{
+			$bCustomized = false;
+			
+			// Search for an eventual user defined dashboard, overloading the existing one
+			$oUDSearch = new DBObjectSearch('UserDashboard');
+			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$oUDSearch->AddCondition('menu_code', $this->sMenuId, '=');
+			$oUDSet = new DBObjectSet($oUDSearch);
+			if ($oUDSet->Count() > 0)
+			{
+				// Assuming there is at most one couple {user, menu}!
+				$oUserDashboard = $oUDSet->Fetch();
+				$sDashboardDefinition = $oUserDashboard->Get('contents');
+				$bCustomized = true;
+				
+			}
+			$oDashboard = new RuntimeDashboard($this->sMenuId);
+			$oDashboard->FromXml($sDashboardDefinition);
+			$oDashboard->SetCustomFlag($bCustomized);
+		}
+		else
+		{
+			$oDashboard = null;
+		}
+		return $oDashboard;
 	}

 	/**
-	 * @param \iTopWebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string[] $aExtraParams
 	 * @throws CoreException
 	 * @throws Exception
@@ -1169,9 +1183,38 @@ class DashboardMenuNode extends MenuNode
 		{
 			$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $this->sMenuId);
 			$oPage->add('<div class="dashboard_contents" id="'.$sDivId.'">');
-			$oDashboard->SetReloadURL($this->GetHyperlink($aExtraParams));
 			$oDashboard->Render($oPage, false, $aExtraParams);
 			$oPage->add('</div>');
+			$oDashboard->RenderEditionTools($oPage);
+
+			if ($oDashboard->GetAutoReload())
+			{
+				$sId = $this->sMenuId;
+				$sExtraParams = json_encode($aExtraParams);
+				$iReloadInterval = 1000 * $oDashboard->GetAutoReloadInterval();
+				$oPage->add_script(
+<<<EOF
+					setInterval("ReloadDashboard('$sDivId');", $iReloadInterval);
+
+					function ReloadDashboard(sDivId)
+					{
+						var oExtraParams = $sExtraParams;
+						// Do not reload when a dialog box is active
+						if (!($('.ui-dialog:visible').length > 0))
+						{
+							$('.dashboard_contents#'+sDivId).block();
+							$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+							   { operation: 'reload_dashboard', dashboard_id: '$sId', extra_params: oExtraParams},
+							   function(data){
+								 $('.dashboard_contents#'+sDivId).html(data);
+								 $('.dashboard_contents#'+sDivId).unblock();
+								}
+							 );
+						}
+					}
+EOF
+				);
+			}

 			$bEdit = utils::ReadParam('edit', false);
 			if ($bEdit)
--- a/application/newsroomprovider.class.inc.php
+++ b/application/newsroomprovider.class.inc.php
@@ -1,159 +0,0 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * A provider for messages to be displayed in the iTop Newsroom
- */
-interface iNewsroomProvider
-{
-	/**
-	 * Inject the current configuration in the provider
-	 * @param Config $oConfig
-	 * @return void
-	 */
-	public function SetConfig(Config $oConfig);
-
-	/**
-	 * Tells if this provider is enabled for the given user
-	 * @param User $oUser The user for who to check if the provider is applicable.
-	 * return bool
-	 */
-	public function IsApplicable(User $oUser = null);
-	
-	/**
-	 * The human readable (localized) label for this provider
-	 * @return string
-	 */
-	public function GetLabel();
-	
-	/**
-	 * The URL to query (from the browser, using jsonp) to fetch all unread messages
-	 * @return string
-	 */
-	public function GetFetchURL();
-	
-	/**
-	 * The URL to navigate to in order to display all messages
-	 * @return string
-	 */
-	public function GetViewAllURL();
-	
-	/**
-	 * The URL to query(from the browser, using jsonp) to mark all unread messages as read
-	 * @return string
-	 */
-	public function GetMarkAllAsReadURL();
-	
-	/**
-	 * Return the URL to configure the preferences for this provider or null is there is nothing to configure
-	 * @return string|null
-	 */
-	public function GetPreferencesUrl();
-	
-	/**
-	 * Return an array key => value to be replaced in URL of the messages
-	 * Example: '%itop_root%' => utils::GetAbsoluteUrlAppRoot();
-	 * @return string[]
-	 */
-	public function GetPlaceholders();
-	
-	/**
-	 * The duration between to refreshes of the cache (in seconds)
-	 * @return int
-	 */
-	public function GetTTL();
-}
-
-/**
- * Basic implementation of a Newsroom provider, to be overloaded by your own provider implementation
- *
- */
-abstract class NewsroomProviderBase implements iNewsroomProvider
-{
-	/**
-	 * The current configuration parameters
-	 * @var Config
-	 */
-	protected $oConfig;
-	
-	public function __construct()
-	{
-		$this->oConfig = null;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::SetConfig()
-	 */
-	public function SetConfig(Config $oConfig)
-	{
-		$this->oConfig = $oConfig;		
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetPreferencesUrl()
-	 */
-	public function GetPreferencesUrl()
-	{
-		return null; // No preferences
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetLabel()
-	 */
-	public abstract function GetLabel();
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetFetchURL()
-	 */
-	public abstract function GetFetchURL();
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetMarkAllURL()
-	 */
-	public abstract function GetMarkAllAsReadURL();
-
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetViewAllURL()
-	 */
-	public abstract function GetViewAllURL();
-
-	public function IsApplicable(User $oUser = null)
-	{
-		return false;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * @see iNewsroomProvider::GetPlaceholders()
-	 */
-	public function GetPlaceholders()
-	{
-		return array(); // By default, empty set of placeholders
-	}
-	
-	public function GetTTL()
-	{
-		return 10*60; // Refresh every 10 minutes
-	}
-}
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -37,15 +37,8 @@ class NiceWebPage extends WebPage
    {
        parent::__construct($s_title, $bPrintable);
 		$this->m_aReadyScripts = array();
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-3.3.1.min.js');
-		if(utils::IsDevelopmentEnvironment()) // Needed since many other plugins still rely on oldies like $.browser
-		{
-			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-3.0.1.dev.js');
-		}
-		else
-		{
-			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-3.0.1.prod.min.js');
-		}
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
@@ -54,7 +47,6 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/table-selectable-lines.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
@@ -69,7 +61,6 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_tag_set.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
--- a/application/pdfpage.class.inc.php
+++ b/application/pdfpage.class.inc.php
@@ -35,7 +35,7 @@ class iTopPDF extends TCPDF
 		
 		// Display the page number (right aligned)
 		// Warning: the 'R'ight alignment does not work when using placeholders like $this->getAliasNumPage() or $this->getAliasNbPages()
-		$this->MultiCell($iPageNumberWidth, 15, Dict::Format('Core:BulkExport:PDF:PageNumber' ,$this->page), 0, 'R', false, 0 /* $ln */, '', '', true, 0, false, true, 15, 'M' /* $valign */);
+		$this->MultiCell($iPageNumberWidth, 15, 'Page '.$this->page, 0, 'R', false, 0 /* $ln */, '', '', true, 0, false, true, 15, 'M' /* $valign */);
 		
 		// Branding logo
 		$sBrandingIcon = APPROOT.'images/itop-logo.png';
--- a/application/portalwebpage.class.inc.php
+++ b/application/portalwebpage.class.inc.php
@@ -807,7 +807,7 @@ EOF
 	 */
 	public function DoUpdateObjectFromPostedForm(DBObject $oObj, $aAttList = null)
 	{
-		$sTransactionId = utils::ReadPostedParam('transaction_id', '', 'transaction_id');
+		$sTransactionId = utils::ReadPostedParam('transaction_id', '');
 		if (!utils::IsTransactionValid($sTransactionId))
 		{
 			throw new TransactionException();
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -47,14 +47,14 @@ abstract class Query extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));

+		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));

 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
-		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }

@@ -77,15 +77,13 @@ class QueryOQL extends Query
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		// Rolled back to AttributeText until AttributeQueryAttCodeSet can manage fields order correctly
-		//MetaModel::Init_AddAttribute(new AttributeQueryAttCodeSet("fields", array("allowed_values"=>null,"max_items" => 1000, "query_field" => "oql", "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array('oql'))));

 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}

 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
@@ -138,41 +136,6 @@ class QueryOQL extends Query
 		}
 		return $aFieldsMap;
 	}
-
-// Rolled back until 'fields' can be properly managed by AttributeQueryAttCodeSet
-//
-//	public function ComputeValues()
-//	{
-//		parent::ComputeValues();
-//
-//		// Remove unwanted attribute codes
-//		$aChanges = $this->ListChanges();
-//		if (isset($aChanges['fields']))
-//		{
-//			$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'fields');
-//			$aArgs = array('this' => $this);
-//			$aAllowedValues = $oAttDef->GetAllowedValues($aArgs);
-//
-//			/** @var \ormSet $oValue */
-//			$oValue = $this->Get('fields');
-//			$aValues = $oValue->GetValues();
-//			$bChanged = false;
-//			foreach($aValues as $key => $sValue)
-//			{
-//				if (!isset($aAllowedValues[$sValue]))
-//				{
-//					unset($aValues[$key]);
-//					$bChanged = true;
-//				}
-//			}
-//			if ($bChanged)
-//			{
-//				$oValue->SetValues($aValues);
-//				$this->Set('fields', $oValue);
-//			}
-//		}
-//	}
-
 }

 ?>
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -24,49 +24,16 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

-// This storage is freed on error (case of allowed memory exhausted)
-$sReservedMemory = str_repeat('*', 1024 * 1024);
-register_shutdown_function(function()
-{
-	global $sReservedMemory;
-	$sReservedMemory = null;
-	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
-	{
-		if (strpos($err['message'], 'Allowed memory size of') !== false)
-		{
-			$sLimit = ini_get('memory_limit');
-			echo "<p>iTop: Allowed memory size of $sLimit exhausted, contact your administrator to increase memory_limit in php.ini</p>\n";
-		}
-		else
-		{
-			echo "<p>iTop: An error occurred, check server error log for more information.</p>\n";
-		}
-	}
-});
-
 require_once(APPROOT.'/core/cmdbobject.class.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/core/contexttag.class.inc.php');
 session_name('itop-'.md5(APPROOT));
 session_start();
 $sSwitchEnv = utils::ReadParam('switch_env', null);
-$bAllowCache = true;
-if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE)) && isset($_SESSION['itop_env']) && ($_SESSION['itop_env'] !== $sSwitchEnv))
+if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE)))
 {
 	$_SESSION['itop_env'] = $sSwitchEnv;
 	$sEnv = $sSwitchEnv;
-    $bAllowCache = false;
-    // Reset the opcache since otherwise the PHP "model" files may still be cached !!
-    if (function_exists('opcache_reset'))
-    {
-        // Zend opcode cache
-        opcache_reset();
-    }
-    if (function_exists('apc_clear_cache'))
-    {
-        // APC(u) cache
-        apc_clear_cache();
-    }
 	// TODO: reset the credentials as well ??
 }
 else if (isset($_SESSION['itop_env']))
@@ -79,4 +46,4 @@ else
 	$_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
 }
 $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
+MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
--- a/application/transaction.class.inc.php
+++ b/application/transaction.class.inc.php
@@ -119,7 +119,7 @@ class privUITransactionSession
 		// Strictly speaking, the two lines below should be grouped together
 		// by a critical section
 		// sem_acquire($rSemIdentified);
-		$id = static::GetUserPrefix() . str_replace(array('.', ' '), '', microtime()); //1 + count($_SESSION['transactions']);
+		$id = str_replace(array('.', ' '), '', microtime()); //1 + count($_SESSION['transactions']);
 		$_SESSION['transactions'][$id] = true;
 		// sem_release($rSemIdentified);
 		
@@ -174,17 +174,6 @@ class privUITransactionSession
 			// sem_release($rSemIdentified);
 		}		
 	}
-
-	/**
-	 * Returns a string to prefix transaction ID with info from the current user.
-	 *
-	 * @return string
-	 */
-	protected static function GetUserPrefix()
-	{
-		$sPrefix = 'u'.UserRights::GetUserId();
-		return $sPrefix.'-';
-	}
 }

 /**
@@ -217,7 +206,7 @@ class privUITransactionFile
 			throw new Exception('The directory "'.APPROOT.'data/transactions" must be writable to the application.');
 		}
 		self::CleanupOldTransactions();
-		$id = basename(tempnam(APPROOT.'data/transactions', static::GetUserPrefix()));
+		$id = basename(tempnam(APPROOT.'data/transactions', self::GetUserPrefix()));
 		self::Info('GetNewTransactionId: Created transaction: '.$id);

 		return (string)$id;
@@ -321,11 +310,6 @@ class privUITransactionFile
 		return $aResult;
 	}

-	/**
-	 * Returns a prefix based on the user login instead of its ID for a better usage in tempnam()
-	 *
-	 * @inheritdoc
-	 */
 	protected static function GetUserPrefix()
 	{
 		$sPrefix = substr(UserRights::GetUser(), 0, 10);
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -101,7 +101,7 @@ class UIExtKeyWidget
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 * @param WebPage $oP The web page used for all the output
-	 * @param array $aArgs Extra context arguments
+	 * @param Hash $aArgs Extra context arguments
 	 * @return string The HTML fragment to be inserted into the page
 	 */
 	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = null, $sDisplayStyle = 'select', $bSearchMultiple = true)
@@ -145,12 +145,7 @@ class UIExtKeyWidget
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 		$oAllowedValues->SetShowObsoleteData(utils::ShowObsoleteData());
-		// Don't automatically launch the search if the table is huge
-		$bDoSearch = !utils::IsHighCardinality($this->sTargetClass);
-		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
-
-		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
-		if (!$oAllowedValues->CountExceeds($iMaxComboLength))
+		if ($oAllowedValues->Count() < $iMaxComboLength)
 		{
            // Discrete list of values, use a SELECT or RADIO buttons depending on the config
 			switch($sDisplayStyle)
@@ -175,6 +170,7 @@ class UIExtKeyWidget
 				case 'select':
 				case 'list':
 				default:
+				$sSelectMode = 'true';

 				$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
 				$sHTMLValue .= "<div class=\"field_select_wrapper\">\n";
@@ -207,13 +203,13 @@ class UIExtKeyWidget
 					if (($oAllowedValues->Count() == 1) && ($bMandatory == 'true') )
 					{
 						// When there is only once choice, select it by default
-						$sSelected = 'selected';
+						$sSelected = ' selected';
 					}
 					else
 					{
-						$sSelected = (is_array($value) && in_array($key, $value)) || ($value == $key) ? 'selected' : '';
+						$sSelected = (is_array($value) && in_array($key, $value)) || ($value == $key) ? ' selected' : '';
 					}
-					$sHTMLValue .= "<option value=\"$key\" $sSelected>$display_value</option>\n";
+					$sHTMLValue .= "<option value=\"$key\"$sSelected>$display_value</option>\n";
 				}
 				$sHTMLValue .= "</select>\n";
 				$sHTMLValue .= "</div>\n";
@@ -233,7 +229,7 @@ class UIExtKeyWidget
 				}
 				$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
 		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
 		$('#$this->iId').bind('change', function() { $(this).trigger('extkeychange') } );
@@ -245,6 +241,8 @@ EOF
 		else
 		{
 			// Too many choices, use an autocomplete
+			$sSelectMode = 'false';
+
 			// Check that the given value is allowed
 			$oSearch = $oAllowedValues->GetFilter();
 			$oSearch->AddCondition('id', $value);
@@ -263,9 +261,10 @@ EOF
 				$sDisplayValue = $this->GetObjectName($value);
 			}
 			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
+			$iFieldSize = isset($aArgs['iFieldSize']) ? $aArgs['iFieldSize'] : 20; //@@@ $this->oAttDef->GetMaxSize();

 			// the input for the auto-complete
-			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
+			$sHTMLValue .= "<input class=\"field_autocomplete\" count=\"".$oAllowedValues->Count()."\" 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>";

 			// another hidden input to store & pass the object's Id
@@ -275,7 +274,7 @@ EOF
 			// Scripts to start the autocomplete and bind some events to it
 			$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
 		$('#label_$this->iId').autocomplete(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', { scroll:true, minChars:{$iMinChars}, autoFill:false, matchContains:true, mustMatch: true, keyHolder:'#{$this->iId}', extraParams:{operation:'ac_extkey', sTargetClass:'{$this->sTargetClass}',sFilter:'$sFilter',bSearchMode:$JSSearchMode, json: function() { return $sWizHelperJSON; } }});
 		$('#label_$this->iId').keyup(function() { if ($(this).val() == '') { $('#$this->iId').val(''); } } ); // Useful for search forms: empty value in the "label", means no value, immediatly !
@@ -332,8 +331,7 @@ EOF
 		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
 		{
 			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
-			/** @var \DBObject $oCurrObject */
-			$aArgs = $oCurrObject->ToArgsForQuery();
+			$aArgs = array('this' => $oCurrObject);
 			$aParams = array('query_params' => $aArgs);
 			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aArgs);
 			$oFilter = $oSet->GetFilter();
@@ -378,13 +376,9 @@ EOF

 	/**
 	 * Search for objects to be selected
-	 *
 	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
-	 * @param $sFilter
 	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
-	 * @param null $oObj
-	 *
-	 * @throws \OQLException
+	 * @param Array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of the search
 	 */
 	public function SearchObjectsToSelect(WebPage $oP, $sFilter, $sRemoteClass = '', $oObj = null)
 	{
@@ -403,24 +397,18 @@ EOF
 		// Current extkey value, so we can display event if it is not available anymore (eg. archived).
 		$iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);

-		$oBlock = new DisplayBlock($oFilter, 'list_search', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
+		$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
 		$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode)); // Don't display the 'Actions' menu on the results
 	}

-    /**
-     * Search for objects to be selected
-     *
-     * @param WebPage  $oP        The page used for the output (usually an AjaxWebPage)
-     * @param string   $sFilter   The OQL expression used to define/limit limit the scope of possible values
-     * @param DBObject $oObj      The current object for the OQL context
-     * @param string   $sContains The text of the autocomplete to filter the results
-     * @param string   $sOutputFormat
-     * @param null     $sOperation for the values @see ValueSetObjects->LoadValues()
-     *
-     * @throws CoreException
-     * @throws OQLException
-     */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null)
+	/**
+	 * Search for objects to be selected
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sFilter The OQL expression used to define/limit limit the scope of possible values
+	 * @param DBObject $oObj The current object for the OQL context
+	 * @param string $sContains The text of the autocomplete to filter the results
+	 */
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV)
 	{
 		if (is_null($sFilter))
 		{
@@ -431,34 +419,15 @@ EOF
        $iCurrentExtKeyId = (is_null($oObj) || $this->sAttCode === '') ? 0 : $oObj->Get($this->sAttCode);

 		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
-		$iMax = 150;
-		$oValuesSet->SetLimit($iMax);
-		$oValuesSet->SetSort(false);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-		$oValuesSet->SetLimit($iMax);
-		$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
-		asort($aValuesContains);
-		$aValues = array();
-		foreach($aValuesContains as $sKey => $sFriendlyName)
-		{
-			if (!isset($aValues[$sKey]))
-			{
-				$aValues[$sKey] = $sFriendlyName;
-			}
-		}
+		$aValues = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains);

 		switch($sOutputFormat)
 		{
 			case static::ENUM_OUTPUT_FORMAT_JSON:
-
-			    $aJsonMap = array();
-			    foreach ($aValues as $sKey => $sLabel)
-                {
-                    $aJsonMap[] = array('value' => $sKey, 'label' => $sLabel);
-                }
-
-			    $oP->SetContentType('application/json');
-                $oP->add(json_encode($aJsonMap));
+				// Array flip to preserve values order on the label, otherwise the JS will re-order regarding the keys.
+				$oP->SetContentType('application/json');
+				$oP->add(json_encode(array_flip($aValues)));
 				break;

 			case static::ENUM_OUTPUT_FORMAT_CSV:
@@ -492,15 +461,12 @@ EOF
 		}
 	}

-	/**
+    /**
 	 * Get the form to select a leaf class from the $this->sTargetClass (that should be abstract)
 	 * Note: Inspired from UILinksWidgetDirect::GetObjectCreationDialog()
 	 *
-	 * @param WebPage $oPage
-	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
+     * @param WebPage $oPage
+     */
 	public function GetClassSelectionForm(WebPage $oPage)
 	{
        // For security reasons: check that the "proposed" class is actually a subclass of the linked class
@@ -602,11 +568,21 @@ EOF
 		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
-
-	    $oFilter = DBObjectSearch::FromOQL($sFilter);
-		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-		$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj, 'current_extkey_id' => $currValue));
-
+		try
+		{
+		    $oFilter = DBObjectSearch::FromOQL($sFilter);
+			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
+			$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj, 'current_extkey_id' => $currValue));
+		}
+		catch(MissingQueryArgument $e)
+		{
+			// When used in a search form the $this parameter may be missing, in this case return all possible values...
+			// TODO check if we can improve this behavior...
+			$sOQL = 'SELECT '.$this->m_sTargetClass;
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
+			$oSet = new DBObjectSet($oFilter);
+		}
 		$oSet->SetShowObsoleteData(utils::ShowObsoleteData());

 		$sHKAttCode = MetaModel::IsHierarchicalClass($this->sTargetClass);
--- a/application/ui.htmleditorwidget.class.inc.php
+++ b/application/ui.htmleditorwidget.class.inc.php
@@ -101,7 +101,7 @@ class UIHTMLEditorWidget
 		$oPage->add_ready_script(
 				<<<EOF
 $('#$iId').bind('update', function(evt){
-	BlockField('cke_$iId', $('#$iId').prop('disabled'));
+	BlockField('cke_$iId', $('#$iId').attr('disabled'));
 	//Delayed execution - ckeditor must be properly initialized before setting readonly
 	var retryCount = 0;
 	var oMe = $('#$iId');
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -275,10 +275,7 @@ class UILinksWidgetDirect
 		$sJSONLabels = json_encode($aLabels);
 		$sJSONButtons = json_encode($aButtons);
 		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
-		// Don't automatically launch the search if the table is huge
-		$bDoSearch = !utils::IsHighCardinality($this->sLinkedClass);
-		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
-		$oPage->add_ready_script("$('#{$this->sInputid}').directlinks({class_name: '$this->sClass', att_code: '$this->sAttCode', input_name:'$sInputName', labels: $sJSONLabels, submit_to: '$sSubmitUrl', buttons: $sJSONButtons, oWizardHelper: $sWizHelper, do_search: $sJSDoSearch});");
+		$oPage->add_ready_script("$('#{$this->sInputid}').directlinks({class_name: '$this->sClass', att_code: '$this->sAttCode', input_name:'$sInputName', labels: $sJSONLabels, submit_to: '$sSubmitUrl', buttons: $sJSONButtons, oWizardHelper: $sWizHelper });");
 	}

 	/**
@@ -340,7 +337,6 @@ class UILinksWidgetDirect
 				'result_list_outer_selector' => "SearchResultsToAdd_{$this->sInputid}",
 				'table_id' => "add_{$this->sInputid}",
 				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
-				'selection_mode' => true,
 				'cssCount' => "#count_{$this->sInputid}",
 				'query_params' => $oFilter->GetInternalParams(),
 				'hidden_criteria' => $sHiddenCriteria,
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -194,8 +194,7 @@ class UILinksWidget
 			$aArgs['prefix'] = $sPrefix;
 			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".($iUniqueId < 0 ? -$iUniqueId : $iUniqueId);
 			$aArgs['this'] = $oNewLinkObj;
-			$sInputValue = $iUniqueId > 0 ? "-$iUniqueId" : "$iUniqueId";
-			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$sInputValue\">";
+			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"-$iUniqueId\">";
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.-$iUniqueId.']';
@@ -214,7 +213,7 @@ class UILinksWidget
 			// Rows added before loading the form cannot call OnLinkAdded.
 			if ($iUniqueId > 0)
 			{
-				$oP->add_ready_script(
+				$oP->add_script(
 					<<<EOF
 PrepareWidgets();
 oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
@@ -338,7 +337,6 @@ EOF
 		$oValue->Rewind();
 		$aForm = array();
 		$iAddedId = 1; // Unique id for new links
-		$aAddedLinks = array();
 		while($oCurrentLink = $oValue->Fetch())
 		{
 		    // We try to retrieve the remote object as usual
@@ -358,8 +356,6 @@ EOF
            if ($oCurrentLink->IsNew())
            {
                $key = -($iAddedId++);
-                $iUniqueId = -$key;
-	            $aAddedLinks[] = array('iAddedId' => $iUniqueId, 'iRemote' => $oCurrentLink->Get($this->m_sExtKeyToRemote));
            }
            else
            {
@@ -369,24 +365,12 @@ EOF
 		}
 		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
 		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
-		// Don't automatically launch the search if the table is huge
-		$bDoSearch = !utils::IsHighCardinality($this->m_sRemoteClass);
-		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
 		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
 		$oPage->add_ready_script(<<<EOF
-		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
+		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}');
 		oWidget{$this->m_iInputId}.Init();
 EOF
 );
-
-		foreach ($aAddedLinks as $aAddedLink)
-		{
-			$oPage->add_ready_script(<<<EOF
-			oWidget{$this->m_iInputId}.AddLink({$aAddedLink['iAddedId']}, {$aAddedLink['iRemote']});
-EOF
-			);
-		}
-
 		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
 		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
 		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
--- a/application/ui.passwordwidget.class.inc.php
+++ b/application/ui.passwordwidget.class.inc.php
@@ -73,17 +73,17 @@ class UIPasswordWidget
 		$oPage->add_ready_script("$('#{$this->iId}_confirm').bind('keyup change', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
 		$oPage->add_ready_script("$('#{$this->iId}').bind('update', function(evt, sFormId)
 			{
-				if ($(this).prop('disabled'))
+				if ($(this).attr('disabled'))
 				{
-					$('#{$this->iId}_confirm').prop('disabled', true);
-					$('#{$this->iId}_changed').prop('disabled', true);
-					$('#{$this->iId}_reset').prop('disabled', true);
+					$('#{$this->iId}_confirm').attr('disabled', 'disabled');
+					$('#{$this->iId}_changed').attr('disabled', 'disabled');
+					$('#{$this->iId}_reset').attr('disabled', 'disabled');
 				}
 				else
 				{
-					$('#{$this->iId}_confirm').prop('disabled', false);
-					$('#{$this->iId}_changed').prop('disabled', false);
-					$('#{$this->iId}_reset').prop('disabled', false);
+					$('#{$this->iId}_confirm').removeAttr('disabled');
+					$('#{$this->iId}_changed').removeAttr('disabled');
+					$('#{$this->iId}_reset').removeAttr('disabled');
 				}
 			}
 		);"); // Bind to a custom event: update to handle enabling/disabling
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -1,7 +1,6 @@
 <?php
-
+use Html2Text\Html2Text;
 use Leafo\ScssPhp\Compiler;
-
 // Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
@@ -27,9 +26,8 @@ use Leafo\ScssPhp\Compiler;
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

-require_once(APPROOT.'core/metamodel.class.php');
-require_once(APPROOT.'core/config.class.inc.php');
-require_once(APPROOT.'application/transaction.class.inc.php');
+require_once(APPROOT.'/core/config.class.inc.php');
+require_once(APPROOT.'/application/transaction.class.inc.php');
 require_once(APPROOT.'application/Html2Text.php');
 require_once(APPROOT.'application/Html2TextException.php');

@@ -38,8 +36,6 @@ define('ITOP_DEFAULT_CONFIG_FILE', APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE

 define('SERVER_NAME_PLACEHOLDER', '$SERVER_NAME$');

-define('SERVER_MAX_URL_LENGTH', 2048);
-
 class FileUploadException extends Exception
 {
 }
@@ -314,19 +310,9 @@ class utils
 			{
 				switch($sSanitizationFilter)
 				{
-					case 'transaction_id':
-						// same as parameter type but keep the dot character
-						// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
-						// it must be included at the regexp beginning otherwise you'll get an invalid character error
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
-							array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
-					break;
-
 					case 'parameter':
-						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
-							array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
-						// characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
-						break;
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=-]*$/'))); // the '=' equal character is used in serialized filters
+					break;
 					
 					case 'field_name':
 					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
@@ -476,9 +462,9 @@ class utils
 	{
 		$sSelectionMode = utils::ReadParam('selectionMode', '');

-		if ($sSelectionMode != 'positive' && $sSelectionMode != 'negative')
+		if ($sSelectionMode === '')
 		{
-			throw new CoreException('selectionMode must be either positive or negative');
+			throw new CoreException('selectionMode is mandatory');
 		}

 		// Paginated selection
@@ -527,7 +513,7 @@ class utils
 	/**
 	 * Returns a unique tmp id for the current upload based on the transaction system (db).
 	 *
-	 * Build as static::GetNewTransactionId()
+	 * Build as session_id() . '_' . static::GetNewTransactionId()
 	 *
 	 * @return string
 	 */
@@ -537,7 +523,7 @@ class utils
 		{
 			$sTransactionId = static::GetNewTransactionId();
 		}
-		return $sTransactionId;
+		return session_id() . '_' . $sTransactionId;
 	}

 	public static function ReadFromFile($sFileName)
@@ -573,18 +559,6 @@ class utils
        return $iReturn;
    }

-  /**
-   * Checks if the memory limit is at least what is required
-   *
-   * @param int $memoryLimit set limit in bytes
-   * @param int $requiredLimit required limit in bytes
-   * @return bool
-   */
-  public static function IsMemoryLimitOk($memoryLimit, $requiredLimit)
-  {
-      return ($memoryLimit >= $requiredLimit) || ($memoryLimit == -1);
-  }
-
 	/**
 	 * Format a value into a more friendly format (KB, MB, GB, TB) instead a juste a Bytes amount.
 	 *
@@ -684,55 +658,30 @@ class utils
 		return str_replace($aSearch, $aReplacement, $sOldDateTimeFormat);
 	}

-	/**
-	 * @return \Config from the current environement, or if not existing from the production env, else new Config made from scratch
-	 * @uses \MetaModel::GetConfig() don't forget to add the needed <code>require_once(APPROOT.'core/metamodel.class.php');</code>
-	 */
 	static public function GetConfig()
 	{
 		if (self::$oConfig == null)
 		{
 		    self::$oConfig = MetaModel::GetConfig();
-
 		    if (self::$oConfig == null)
 		    {
    			$sConfigFile = self::GetConfigFilePath();
-    			if (!file_exists($sConfigFile))
+    			if (file_exists($sConfigFile))
    			{
-				    $sConfigFile = self::GetConfigFilePath('production');
-				    if (!file_exists($sConfigFile))
-				    {
-				    	$sConfigFile = null;
-				    }
+    				self::$oConfig = new Config($sConfigFile);
+    			}
+    			else
+    			{
+    				// When executing the setup, the config file may be still missing
+    				self::$oConfig = new Config();
    			}
-
-			    self::$oConfig = new Config($sConfigFile);
 		    }
 		}
 		return self::$oConfig;
 	}
-
-	public static function InitTimeZone() {
-		$oConfig = self::GetConfig();
-		$sItopTimeZone = $oConfig->Get('timezone');
-
-		if (!empty($sItopTimeZone))
-		{
-			date_default_timezone_set($sItopTimeZone);
-		}
-		else
-		{
-			// Leave as is... up to the admin to set a value somewhere...
-			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
-		}
-	}
-
    /**
     * Returns the absolute URL to the application root path
-     *
     * @return string The absolute URL to the application root, without the first slash
-     *
-     * @throws \Exception
     */                   
 	static public function GetAbsoluteUrlAppRoot()
 	{
@@ -761,15 +710,7 @@ 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
-     */
-    static public function GetDefaultUrlAppRoot()
+	static public function GetDefaultUrlAppRoot()
 	{
 		// Build an absolute URL to this page on this server/port
 		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
@@ -838,7 +779,7 @@ class utils

 	/**
 	 * Helper to handle the variety of HTTP servers
-	 * See N°286 (fixed in [896]), and N°634 (this fix)
+	 * See #286 (fixed in [896]), and #634 (this fix)
 	 * 	 
 	 * Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
 	 * nginx set it to an empty string
@@ -1061,15 +1002,11 @@ class utils
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
 			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
 			
-			$aResult = array();
-			if (strlen($sUrl) < SERVER_MAX_URL_LENGTH)
-			{
-				$aResult[] = new SeparatorPopupMenuItem();
+			$aResult = array(
+				new SeparatorPopupMenuItem(),
 				// Static menus: Email this page, CSV Export & Add to Dashboard
-				$aResult[] = new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'),
-						"mailto:?body=".urlencode($sUrl).' ' // Add an extra space to make it work in Outlook
-				);
-			}
+				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
+			);
 			
 			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO)
 			{
@@ -1091,7 +1028,12 @@ class utils
 			// $param is a DBObject
 			$oObj = $param;
 			$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+			$sFilter = $oFilter->serialize();
 			$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
+			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage(get_class($oObj));
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
 			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
@@ -1111,29 +1053,19 @@ class utils
 			break;

 			case iPopupMenuExtension::MENU_DASHBOARD_ACTIONS:
-				// $param is a Dashboard
-				/** @var \RuntimeDashboard $oDashboard */
-				$oDashboard = $param;
-				$sDashboardId = $oDashboard->GetId();
-				$sDashboardFile = $oDashboard->GetDefinitionFile();
-				$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
-				$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
-				$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
-				$sDashboardFileJS = addslashes($sDashboardFile);
-				$sDashboardFileURL = urlencode($sDashboardFile);
-				$sUploadDashboardTransactId = utils::GetNewTransactionId();
-				$aResult = array(
-					new SeparatorPopupMenuItem(),
-					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sDashboardId.'&file='.$sDashboardFileURL),
-					new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sDashboardId', file: '$sDashboardFileJS', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn', transaction: '$sUploadDashboardTransactId' })"),
-				);
-				if ($oDashboard->GetReloadURL())
-				{
-					$aResult[] = new SeparatorPopupMenuItem();
-					$aResult[] = new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $oDashboard->GetReloadURL().'&printable=1', '_blank');
-				}
-
-				break;
+			// $param is a Dashboard
+			$oAppContext = new ApplicationContext();
+			$aParams = $oAppContext->GetAsHash();
+			$sMenuId = ApplicationMenu::GetActiveNodeId();
+			$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
+			$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
+			$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
+			$aResult = array(
+				new SeparatorPopupMenuItem(),
+				new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sMenuId),
+				new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sMenuId', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn' })"),
+			);
+			break;

 			default:
 			// Unknown type of menu, do nothing
@@ -1438,16 +1370,6 @@ class utils
 		return $aPossibleEncodings;
 	}
 	
-	/**
-	 * Helper to encapsulation iTop's htmlentities
-	 * @param string $sValue
-	 * @return string
-	 */
-	static public function HtmlEntities($sValue)
-	{
-		return htmlentities($sValue, ENT_QUOTES, 'UTF-8');
-	}
-
 	/**
 	 * Convert a string containing some (valid) HTML markup to plain text
 	 * @param string $sHtml
@@ -1489,7 +1411,7 @@ class utils
 	static public function GetCSSFromSASS($sSassRelPath, $aImportPaths = null)
 	{
 		// Avoiding compilation if file is already a css file.
-		if (preg_match('/\.css(\?.*)?$/', $sSassRelPath))
+		if (preg_match('/\.css$/', $sSassRelPath))
 		{
 			return $sSassRelPath;
 		}
@@ -1980,31 +1902,4 @@ class utils
 		}
 		return COMPILATION_TIMESTAMP;
 	}
-
-	/**
-	 * Check if the given class if configured as a high cardinality class.
-	 *
-	 * @param $sClass
-	 *
-	 * @return bool
-	 */
-	public static function IsHighCardinality($sClass)
-	{
-		if (utils::GetConfig()->Get('search_manual_submit'))
-		{
-			return true;
-		}
-		$aHugeClasses = MetaModel::GetConfig()->Get('high_cardinality_classes');
-		return in_array($sClass, $aHugeClasses);
-	}
-
-	/**
-	 * Check if iTop is in a development environment (VCS vs build number)
-	 *
-	 * @return bool
-	 */
-	public static function IsDevelopmentEnvironment()
-	{
-		return ITOP_REVISION  === 'svn';
-	}
 }
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -86,20 +86,12 @@ class WizardHelper
 								}
 								elseif($sLinkedAttDef instanceof AttributeDateTime)
                                {
-                                    $sDateClass = get_class($sLinkedAttDef);
                                    $sDate = $aLinkedObject[$sLinkedAttCode];
                                    if($sDate !== null && $sDate !== '')
                                    {
-                                        $oDateTimeFormat = $sDateClass::GetFormat();
+                                        $oDateTimeFormat = AttributeDateTime::GetFormat();
                                        $oDate = $oDateTimeFormat->Parse($sDate);
-                                        if ($sDateClass == "AttributeDate")
-                                        {
-                                            $sDate = $oDate->format('Y-m-d');
-                                        }
-                                        else
-                                        {
-                                            $sDate = $oDate->format('Y-m-d H:i:s');
-                                        }
+                                        $sDate = $oDate->format('Y-m-d H:i:s');
                                    }

                                    $oLinkedObj->Set($sLinkedAttCode, $sDate);
@@ -154,7 +146,7 @@ class WizardHelper
 					}
 					else
 					{
-						// May happen for security reasons (portal, see ticket N°1074)
+						// May happen for security reasons (portal, see ticket #1074)
 						$oObj->Set($sAttCode, $value);
 					}
 				}
@@ -174,30 +166,6 @@ class WizardHelper
 					}
 					$oObj->Set($sAttCode, $value);
 				}
-				else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
-				{
-					if (is_null($value))
-					{
-						// happens if field is hidden (see N°1827)
-						$value = array();
-					}
-					else
-					{
-						$value = json_decode($value, true);
-					}
-					$oTagSet = new ormTagSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
-					$oTagSet->SetValues($value['orig_value']);
-					$oTagSet->ApplyDelta($value);
-					$oObj->Set($sAttCode, $oTagSet);
-				}
-				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
-				{
-					$value = json_decode($value, true);
-					$oTagSet = new ormSet(get_class($oObj), $sAttCode, $oAttDef->GetMaxItems());
-					$oTagSet->SetValues($value['orig_value']);
-					$oTagSet->ApplyDelta($value);
-					$oObj->Set($sAttCode, $oTagSet);
-				}
 				else
 				{
 					$oObj->Set($sAttCode, $value);
@@ -229,10 +197,11 @@ class WizardHelper
 				// this as to be handled as an array of objects
 				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
 				// NOT YET IMPLEMENTED !!
+				$sLinkedClass = $oAttDef->GetLinkedClass();
 				$oSet = $value;
 				$aData = array();
 				$aFields = $this->GetLinkedWizardStructure($oAttDef);
-				while($oLinkedObj = $oSet->fetch())
+				while($oSet->fetch())
 				{
 					foreach($aFields as $sLinkedAttCode)
 					{
--- a/application/xlsxwriter.class.php
+++ b/application/xlsxwriter.class.php
@@ -40,7 +40,7 @@ Class XLSXWriter
 	
 	protected function tempFilename()
 	{
-		$filename = tempnam(SetupUtils::GettmpDir(), 'xlsx_writer_');
+		$filename = tempnam("/tmp", "xlsx_writer_");
 		$this->temp_files[] = $filename;
 		return $filename;
 	}
--- a/composer.json
+++ b/composer.json
@@ -1,21 +0,0 @@
-{
-  "require": {
-    "php": ">=5.6.0",
-    "ext-mysql": "*",
-    "ext-ldap": "*",
-    "ext-mcrypt": "*",
-    "ext-cli": "*",
-    "ext-soap": "*",
-    "ext-json": "*",
-    "ext-zip": "*",
-    "ext-mysqli": "*",
-    "ext-dom": "*",
-    "ext-iconv": "*",
-    "ext-gd": "*"
-  },
-  "config": {
-    "platform": {
-      "php": "5.6.0"
-    }
-  }
-}
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -60,7 +60,7 @@ abstract class Action extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
+//		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
 	}

@@ -223,14 +223,7 @@ class ActionEmail extends ActionNotification
 		return implode(', ', $aRecipients);
 	}

-	/**
-	 * @param \Trigger $oTrigger
-	 * @param array $aContextArgs
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 */
+
 	public function DoExecute($oTrigger, $aContextArgs)
 	{
 		if (MetaModel::IsLogEnabledNotification())
@@ -269,44 +262,24 @@ class ActionEmail extends ActionNotification
 			{
 				$sPrefix = '';
 			}
-
 			if ($oLog)
 			{
 				$oLog->Set('message', $sPrefix . $sRes);
-                $oLog->DBUpdate();
-            }
-
+			}
 		}
 		catch (Exception $e)
 		{
 			if ($oLog)
 			{
 				$oLog->Set('message', 'Error: '.$e->getMessage());
-
-				try
-				{
-                    $oLog->DBUpdate();
-				}
-				catch (Exception $eSecondTryUpdate)
-				{
-                    IssueLog::Error("Failed to process email ".$oLog->GetKey()." - reason: ".$e->getMessage()."\nTrace:\n".$e->getTraceAsString());
-
-                    $oLog->Set('message', 'Error: more details in the log for email "'.$oLog->GetKey().'"');
-                    $oLog->DBUpdate();
-                }
 			}
 		}
-
+		if ($oLog)
+		{
+			$oLog->DBUpdate();
+		}
 	}

-	/**
-	 * @param \Trigger $oTrigger
-	 * @param array $aContextArgs
-	 * @param \EventNotification $oLog
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 */
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
 	{
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
@@ -375,7 +348,7 @@ class ActionEmail extends ActionNotification
 			$sTestBody .= "</div>\n";
 			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
 			$oEmail->SetRecipientTO($this->Get('test_recipient'));
-			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetRecipientFrom($this->Get('test_recipient'));
 			$oEmail->SetReferences($sReference);
 			$oEmail->SetMessageId($sMessageId);
 		}
--- a/core/asynctask.class.inc.php
+++ b/core/asynctask.class.inc.php
@@ -238,20 +238,7 @@ abstract class AsyncTask extends DBObject
 		{
 			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
 			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
-			if ($this->Get('event_id') != 0)
-			{
-				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s'");
-                try
-                {
-                    $oEventLog->DBUpdate();
-                }
-                catch (Exception $e)
-                {
-                    $oEventLog->Set('message', "Failed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s', more details in the log");
-                    $oEventLog->DBUpdate();
-                }
-			}
+
 			$this->Set('remaining_retries', $iRemaining - 1);
 			$this->Set('status', 'planned');
 			$this->Set('started', null);
@@ -260,20 +247,7 @@ abstract class AsyncTask extends DBObject
 		else
 		{
 			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
-			if ($this->Get('event_id') != 0)
-			{
-				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task.");
-				try
-				{
-                    $oEventLog->DBUpdate();
-				}
-				catch (Exception $e)
-				{
-                    $oEventLog->Set('message', 'Failed to process async task, more details in the log');
-                    $oEventLog->DBUpdate();
-				}
-			}
+
 			$this->Set('status', 'error');
 			$this->Set('started', null);
 			$this->Set('planned', null);
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
--- a/core/autoload.php
+++ b/core/autoload.php
@@ -29,7 +29,6 @@ MetaModel::IncludeModule('core/action.class.inc.php');
 MetaModel::IncludeModule('core/trigger.class.inc.php');
 MetaModel::IncludeModule('core/bulkexport.class.inc.php');
 MetaModel::IncludeModule('core/ownershiplock.class.inc.php');
-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');
--- a/core/bulkexport.class.inc.php
+++ b/core/bulkexport.class.inc.php
@@ -73,8 +73,6 @@ class BulkExportResult extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeString("temp_file_path", array("allowed_values"=>null, "sql"=>"temp_file_path", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLongText("search", array("allowed_values"=>null, "sql"=>"search", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLongText("status_info", array("allowed_values"=>null, "sql"=>"status_info", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
-        MetaModel::Init_AddAttribute(new AttributeBoolean("localize_output", array("allowed_values"=>null, "sql"=>"localize_output", "default_value"=>true, "is_null_allowed"=>true, "depends_on"=>array())));
-
 	}

 	/**
@@ -154,15 +152,12 @@ abstract class BulkExport
 		$this->bLocalizeOutput = false;
 	}
 		
-    /**
-     * Find the first class capable of exporting the data in the given format
-     *
-     * @param string   $sFormatCode The lowercase format (e.g. html, csv, spreadsheet, xlsx, xml, json, pdf...)
-     * @param DBSearch $oSearch     The search/filter defining the set of objects to export or null when listing the supported formats
-     *
-     * @return BulkExport|null
-     * @throws ReflectionException
-     */
+	/**
+	 * Find the first class capable of exporting the data in the given format
+	 * @param string $sFormatCode The lowercase format (e.g. html, csv, spreadsheet, xlsx, xml, json, pdf...)
+	 * @param DBSearch $oSearch The search/filter defining the set of objects to export or null when listing the supported formats
+	 * @return BulkExport|NULL
+	 */
 	static public function FindExporter($sFormatCode, $oSearch = null)
 	{
 		foreach(get_declared_classes() as $sPHPClass)
@@ -184,16 +179,11 @@ abstract class BulkExport
 		return null;
 	}
 	
-    /**
-     * Find the exporter corresponding to the given persistent token
-     *
-     * @param int $iPersistentToken The identifier of the BulkExportResult object storing the information
-     *
-     * @return iBulkExport|null
-     * @throws ArchivedObjectException
-     * @throws CoreException
-     * @throws ReflectionException
-     */
+	/**
+	 * Find the exporter corresponding to the given persistent token
+	 * @param int $iPersistentToken The identifier of the BulkExportResult object storing the information
+	 * @return iBulkExport|NULL
+	 */
 	static public function FindExporterFromToken($iPersistentToken = null)
 	{
 		$oBulkExporter = null;
@@ -210,10 +200,6 @@ abstract class BulkExport
 				$oBulkExporter->SetObjectList($oSearch);
 				$oBulkExporter->SetChunkSize($oInfo->Get('chunk_size'));
 				$oBulkExporter->SetStatusInfo(json_decode($oInfo->Get('status_info'), true));
-
-                $oBulkExporter->SetLocalizeOutput($oInfo->Get('localize_output'));
-
-
 				$oBulkExporter->sTmpFile = $oInfo->Get('temp_file_path');
 				$oBulkExporter->oBulkExportResult = $oInfo;
 			}
@@ -273,14 +259,6 @@ abstract class BulkExport
 		$this->iChunkSize = $iChunkSize;
 	}
 	
-    /**
-     * @param $bLocalizeOutput
-     */
-    public function SetLocalizeOutput($bLocalizeOutput)
-    {
-        $this->bLocalizeOutput = $bLocalizeOutput;
-    }
-	
 	/**
 	 * (non-PHPdoc)
 	 * @see iBulkExport::SetObjectList()
@@ -343,9 +321,8 @@ abstract class BulkExport
 			$this->oBulkExportResult->Set('format', $this->sFormatCode);
 			$this->oBulkExportResult->Set('search', $this->oSearch->serialize());
 			$this->oBulkExportResult->Set('chunk_size', $this->iChunkSize);	
-            $this->oBulkExportResult->Set('temp_file_path', $this->sTmpFile);
-            $this->oBulkExportResult->Set('localize_output', $this->bLocalizeOutput);
-        }
+			$this->oBulkExportResult->Set('temp_file_path', $this->sTmpFile);	
+		}
 		$this->oBulkExportResult->Set('status_info', json_encode($this->GetStatusInfo()));
 		utils::PushArchiveMode(false);
 		$ret = $this->oBulkExportResult->DBWrite();
--- a/core/cmdbchangeop.class.inc.php
+++ b/core/cmdbchangeop.class.inc.php
@@ -242,64 +242,6 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		return $sResult;
 	}
 }
-
-/**
- * Record the modification of a tag set attribute
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeTagSet extends CMDBChangeOpSetAttribute
-{
-    public static function Init()
-    {
-        $aParams = array
-        (
-            "category" => "core/cmdb",
-            "key_type" => "",
-            "name_attcode" => "change",
-            "state_attcode" => "",
-            "reconc_keys" => array(),
-            "db_table" => "priv_changeop_setatt_tagset",
-            "db_key_field" => "id",
-            "db_finalclass_field" => "",
-        );
-        MetaModel::Init_Params($aParams);
-        MetaModel::Init_InheritAttributes();
-        MetaModel::Init_AddAttribute(new AttributeText("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-        MetaModel::Init_AddAttribute(new AttributeText("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-        // Display lists
-        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
-        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
-    }
-
-    /**
-     * Describe (as a text string) the modifications corresponding to this change
-     */
-    public function GetDescription()
-    {
-        $sResult = '';
-        $sTargetObjectClass = $this->Get('objclass');
-        $oTargetObjectKey = $this->Get('objkey');
-        $sAttCode = $this->Get('attcode');
-        $oTargetSearch = new DBObjectSearch($sTargetObjectClass);
-        $oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-        $oMonoObjectSet = new DBObjectSet($oTargetSearch);
-        if (UserRights::IsActionAllowedOnAttribute($sTargetObjectClass, $sAttCode, UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-        {
-            if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
-
-            $oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-            $sAttName = $oAttDef->GetLabel();
-            $sNewValue = $this->Get('newvalue');
-            $sOldValue = $this->Get('oldvalue');
-            $sResult = $oAttDef->DescribeChangeAsHTML($sOldValue, $sNewValue);
-        }
-        return $sResult;
-    }
-}
-
 /**
 * Record the modification of an URL 
 *
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -409,19 +409,7 @@ abstract class CMDBObject extends DBObject
 			$oMyChangeOp->Set("newvalue", $value);
 			$iId = $oMyChangeOp->DBInsertNoReload();
 		}
-        elseif ($oAttDef instanceOf AttributeSet)
-        {
-            // Tag Set
-            //
-            $oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeTagSet");
-            $oMyChangeOp->Set("objclass", get_class($this));
-            $oMyChangeOp->Set("objkey", $this->GetKey());
-            $oMyChangeOp->Set("attcode", $sAttCode);
-            $oMyChangeOp->Set("oldvalue", implode(' ', $original->GetValues()));
-            $oMyChangeOp->Set("newvalue", implode(' ', $value->GetValues()));
-            $iId = $oMyChangeOp->DBInsertNoReload();
-        }
-        else
+		else
 		{
 			// Scalars
 			//
@@ -563,12 +551,6 @@ abstract class CMDBObject extends DBObject
 		$this->DBUpdate();
 	}

-	/**
-	 * @param null $oDeletionPlan
-	 *
-	 * @return \DeletionPlan|null
-	 * @throws \DeleteException
-	 */
 	public function DBDelete(&$oDeletionPlan = null)
 	{
 		return $this->DBDeleteTracked_Internal($oDeletionPlan);
@@ -581,12 +563,6 @@ abstract class CMDBObject extends DBObject
 		$this->DBDeleteTracked_Internal($oDeletionPlan);
 	}

-	/**
-	 * @param null $oDeletionPlan
-	 *
-	 * @return \DeletionPlan|null
-	 * @throws \DeleteException
-	 */
 	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		$prevkey = $this->GetKey();
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -108,9 +108,15 @@ class MySQLHasGoneAwayException extends MySQLException
 */
 class CMDBSource
 {
-	const ENUM_DB_VENDOR_MYSQL = 'MySQL';
-	const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
-	const ENUM_DB_VENDOR_PERCONA = 'Percona';
+	/**
+	 * SQL charset & collation declaration for text columns
+	 *
+	 * Using an attribute instead of a constant to avoid crash in the setup for older PHP versions
+	 *
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
+	 * @since 2.5 #1001 switch to utf8mb4
+	 */
+	public static $SQL_STRING_COLUMNS_CHARSET_DEFINITION = ' CHARACTER SET '.DEFAULT_CHARACTER_SET.' COLLATE '.DEFAULT_COLLATION;

 	protected static $m_sDBHost;
 	protected static $m_sDBUser;
@@ -118,32 +124,18 @@ class CMDBSource
 	protected static $m_sDBName;
 	/**
 	 * @var boolean
-	 * @since 2.5 N°1260 MySQL TLS first implementation
+	 * @since 2.5 #1260 MySQL TLS first implementation
 	 */
 	protected static $m_bDBTlsEnabled;
 	/**
 	 * @var string
-	 * @since 2.5 N°1260 MySQL TLS first implementation
+	 * @since 2.5 #1260 MySQL TLS first implementation
 	 */
 	protected static $m_sDBTlsCA;

 	/** @var mysqli $m_oMysqli */
 	protected static $m_oMysqli;

-	/**
-	 * SQL charset & collation declaration for text columns
-	 *
-	 * Using a function instead of a constant or attribute to avoid crash in the setup for older PHP versions (cannot
-	 * use expression as value)
-	 *
-	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
-	 * @since 2.5 N°1001 switch to utf8mb4
-	 */
-	public static function GetSqlStringColumnDefinition()
-	{
-		return ' CHARACTER SET '.DEFAULT_CHARACTER_SET.' COLLATE '.DEFAULT_COLLATION;
-	}
-
 	/**
 	 * @param Config $oConfig
 	 *
@@ -410,27 +402,6 @@ class CMDBSource
 		return $aVersions[0];
 	}

-	/**
-	 * Get the DB vendor between MySQL and its main forks
-	 * @return string
-	 */
-	static public function GetDBVendor()
-	{
-		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-		
-		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
-		if(preg_match('/mariadb/i', $sVersionComment) === 1)
-		{
-			$sDBVendor = static::ENUM_DB_VENDOR_MARIADB;
-		}
-		else if(preg_match('/percona/i', $sVersionComment) === 1)
-		{
-			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
-		}
-		
-		return $sDBVendor;
-	}
-
 	/**
 	 * @param string $sSource
 	 *
@@ -480,15 +451,10 @@ class CMDBSource
 	public static function DropTable($sTable)
 	{
 		$res = self::Query("DROP TABLE `$sTable`");
-		self::_TablesInfoCacheReset(); // reset the table info cache!
+		self::_TablesInfoCacheReset(true); // reset the table info cache!
 		return $res;
 	}

-	public static function CacheReset($sTable)
-	{
-		self::_TablesInfoCacheReset($sTable);
-	}
-
 	/**
 	 * @return \mysqli
 	 */
@@ -526,19 +492,15 @@ class CMDBSource
 	public static function DBPwd() {return self::$m_sDBPwd;}
 	public static function DBName() {return self::$m_sDBName;}

-	/**
-	 * Quote variable and protect against SQL injection attacks
-	 * Code found in the PHP documentation: quote_smart($value)
-	 *
-	 * @param mixed $value
-	 * @param bool $bAlways should be set to true when the purpose is to create a IN clause,
-	 *                      otherwise and if there is a mix of strings and numbers, the clause would always be false
-	 * @param string $cQuoteStyle
-	 *
-	 * @return array|string
-	 */
 	public static function Quote($value, $bAlways = false, $cQuoteStyle = "'")
 	{
+		// Quote variable and protect against SQL injection attacks
+		// Code found in the PHP documentation: quote_smart($value)
+
+		// bAlways should be set to true when the purpose is to create a IN clause,
+		// otherwise and if there is a mix of strings and numbers, the clause
+		// would always be false
+
 		if (is_null($value))
 		{
 			return 'NULL';
@@ -900,20 +862,6 @@ class CMDBSource
 		return ($aFieldData["Type"]);
 	}

-	private static function IsNumericType($aFieldData)
-	{
-		$aNumericTypes = array('tinyint(', 'decimal(', 'int(' );
-		$sType = strtolower($aFieldData["Type"]);
-		foreach ($aNumericTypes as $sNumericType)
-		{
-			if (strpos($sType, $sNumericType) === 0)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * @param string $sTable
 	 * @param string $sField
@@ -952,15 +900,8 @@ class CMDBSource
 			}
 			else
 			{
-				if (self::IsNumericType($aFieldData))
-				{
-					$sRet .= ' DEFAULT '.$aFieldData["Default"];
-				}
-				else
-				{
-					$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
-					$sRet .= ' DEFAULT '.self::Quote($default);
-				}
+				$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
+				$sRet .= ' DEFAULT '.self::Quote($default);
 			}
 		}
 		elseif (is_string($aFieldData["Default"]) == 'string')
@@ -1018,16 +959,9 @@ class CMDBSource
 	
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
-	private static function _TablesInfoCacheReset($sTableName = null)
+	private static function _TablesInfoCacheReset()
 	{
-		if (is_null($sTableName))
-		{
-			self::$m_aTablesInfo = array();
-		}
-		else
-		{
-			self::$m_aTablesInfo[strtolower($sTableName)] = null;
-		}
+		self::$m_aTablesInfo = array();
 	}

 	/**
@@ -1100,7 +1034,7 @@ class CMDBSource
 	 * @return string query to upgrade table charset and collation if needed, null if not
 	 * @throws \MySQLException
 	 *
-	 * @since 2.5 N°1001 switch to utf8mb4
+	 * @since 2.5 #1001 switch to utf8mb4
 	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html
 	 */
 	public static function DBCheckTableCharsetAndCollation($sTableName)
@@ -1121,7 +1055,7 @@ class CMDBSource
 		}


-		return 'ALTER TABLE `'.$sTableName.'` '.self::GetSqlStringColumnDefinition().';';
+		return 'ALTER TABLE `'.$sTableName.'` '.self::$SQL_STRING_COLUMNS_CHARSET_DEFINITION.';';

 	}

@@ -1250,7 +1184,7 @@ class CMDBSource
 	 * @return string query to upgrade database charset and collation if needed, null if not
 	 * @throws \MySQLException
 	 *
-	 * @since 2.5 N°1001 switch to utf8mb4
+	 * @since 2.5 #1001 switch to utf8mb4
 	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
 	 */
 	public static function DBCheckCharsetAndCollation()
@@ -1267,6 +1201,6 @@ class CMDBSource
 			return null;
 		}

-		return 'ALTER DATABASE'.CMDBSource::GetSqlStringColumnDefinition().';';
+		return 'ALTER DATABASE'.CMDBSource::$SQL_STRING_COLUMNS_CHARSET_DEFINITION.';';
 	}
 }
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -19,7 +19,7 @@

 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
-define('ITOP_VERSION', '2.6.0');
+define('ITOP_VERSION', '2.5.0-beta');
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');

@@ -37,7 +37,6 @@ define('ACCESS_READONLY', 0);

 require_once('coreexception.class.inc.php');
 require_once('attributedef.class.inc.php'); // For the defines
-require_once('simplecrypt.class.inc.php');

 class ConfigException extends CoreException
 {
@@ -65,8 +64,8 @@ define('DEFAULT_FAST_RELOAD_INTERVAL', 1 * 60);
 define('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
 define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|basic|external');
 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
+define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random value, later...
+
 /**
 * Config
 * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
@@ -94,7 +93,7 @@ class Config
 	protected $m_aSettings = array(
 		'app_env_label' => array(
 			'type' => 'string',
-			'description' => 'Label displayed to describe the current application environment, defaults to the environment name (e.g. "production")',
+			'description' => 'Label displayed to describe the current application environnment, defaults to the environment name (e.g. "production")',
 			'default' => '',
 			'value' => '',
 			'source_of_value' => '',
@@ -167,7 +166,7 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'db_character_set' => array( // @deprecated to remove in 2.7 ? N°1001 utf8mb4 switch
+		'db_character_set' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
 			'type' => 'string',
 			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4',
 			'default' => 'DEPRECATED_2.5',
@@ -175,7 +174,7 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'db_collation' => array( // @deprecated to remove in 2.7 ? N°1001 utf8mb4 switch
+		'db_collation' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
 			'type' => 'string',
 			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4_unicode_ci',
 			'default' => 'DEPRECATED_2.5',
@@ -201,7 +200,7 @@ class Config
 		),
 		'skip_strong_security' => array(
 			'type' => 'bool',
-			'description' => 'Disable strong security - TEMPORARY: this flag should be removed when we are more confident in the recent change in security',
+			'description' => 'Disable strong security - TEMPORY: this flag should be removed when we are more confident in the recent change in security',
 			'default' => true,
 			'value' => true,
 			'source_of_value' => '',
@@ -217,7 +216,7 @@ class Config
 		),
 		'query_indentation_enabled' => array(
 			'type' => 'bool',
-			'description' => 'For developers: format the SQL queries for human analysis',
+			'description' => 'For developpers: format the SQL queries for human analysis',
 			'default' => false,
 			'value' => false,
 			'source_of_value' => '',
@@ -225,7 +224,7 @@ class Config
 		),
 		'disable_mandatory_ext_keys' => array(
 			'type' => 'bool',
-			'description' => 'For developers: allow every external keys to be undefined',
+			'description' => 'For developpers: allow every external keys to be undefined',
 			'default' => false,
 			'value' => false,
 			'source_of_value' => '',
@@ -266,8 +265,8 @@ class Config
 		'min_autocomplete_chars' => array(
 			'type' => 'integer',
 			'description' => 'The minimum number of characters to type in order to trigger the "autocomplete" behavior',
-			'default' => 2,
-			'value' => 2,
+			'default' => 3,
+			'value' => 3,
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
@@ -408,14 +407,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'tag_set_item_separator' => array(
-			'type' => 'string',
-			'description' => 'Tag set from string: tag label separator',
-			'default' => '|',
-			'value' => '|',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
 		'cron_max_execution_time' => array(
 			'type' => 'integer',
 			'description' => 'Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout',
@@ -450,7 +441,7 @@ class Config
 		),
 		'email_transport' => array(
 			'type' => 'string',
-			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)',
+			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocole)',
 			'default' => "PHPMail",
 			'value' => "PHPMail",
 			'source_of_value' => '',
@@ -504,22 +495,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'email_default_sender_address' => array(
-			'type' => 'string',
-			'description' => 'Default address provided in the email from header field.',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'email_default_sender_label' => array(
-			'type' => 'string',
-			'description' => 'Default label provided in the email from header field.',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
 		'apc_cache.enabled' => array(
 			'type' => 'bool',
 			'description' => 'If set, the APC cache is allowed (the PHP extension must also be active)',
@@ -546,7 +521,7 @@ class Config
 		),
 		'timezone' => array(
 			'type' => 'string',
-			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP',
+			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP',
 			// examples... not used (nor 'description')
 			'examples' => array(
 				'America/Sao_Paulo',
@@ -944,7 +919,7 @@ class Config
 		),
 		'tracking_level_linked_set_default' => array(
 			'type' => 'integer',
-			'description' => 'Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
 			'default' => LINKSET_TRACKING_LIST,
 			'value' => LINKSET_TRACKING_LIST,
 			'source_of_value' => '',
@@ -952,7 +927,7 @@ class Config
 		),
 		'tracking_level_linked_set_indirect_default' => array(
 			'type' => 'integer',
-			'description' => 'Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSetIndirect',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSetIndirect',
 			'default' => LINKSET_TRACKING_ALL,
 			'value' => LINKSET_TRACKING_ALL,
 			'source_of_value' => '',
@@ -993,7 +968,7 @@ class Config
 		'transaction_storage' => array(
 			'type' => 'string',
 			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
-			'default' => 'File',
+			'default' => 'Session',
 			'value' => '',
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
@@ -1062,10 +1037,10 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'draft_attachments_lifetime' => array(
+		'inline_image_garbage_collector_interval' => array(
 			'type' => 'integer',
-			'description' => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.',
-			'default' => 86400,
+			'description' => 'Frequency (in seconds) at which the inline image garbage collector will run.',
+			'default' => 3600,
 			'value' => '',
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
@@ -1120,44 +1095,12 @@ class Config
 		),
 		'search_manual_submit' => array(
 			'type' => 'array',
-			'description' => 'Force manual submit of search all requests',
+			'description' => 'Force manual submit of search requests (class => true)',
 			'default' => false,
 			'value' => true,
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'optimize_requests_for_join_count' => array(
-			'type' => 'bool',
-			'description' => 'Optimize request joins to minimize the count (default is true, try to set it to false in case of performance issues)',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'high_cardinality_classes' => array(
-			'type' => 'array',
-			'description' => 'List of classes with high cardinality (Force manual submit of search)',
-			'default' => array(),
-			'value' => array(),
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'newsroom_enabled' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not the whole newsroom is enabled',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'regenerate_session_id_enabled' => array(
-			'type' => 'bool',
-			'description' => 'If true then session id will be regenerated on each login, to prevent session fixation.',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
 	);

 	public function IsProperty($sPropCode)
@@ -1217,15 +1160,10 @@ class Config

 	}

-    /**
-     * @param string $sPropCode
-     *
-     * @return mixed
-     */
-    public function Get($sPropCode)
-    {
-        return $this->m_aSettings[$sPropCode]['value'];
-    }
+	public function Get($sPropCode)
+	{
+		return $this->m_aSettings[$sPropCode]['value'];
+	}

 	/**
 	 * Event log options (see LOG_... definition)
@@ -1284,29 +1222,13 @@ class Config
 	 */
 	protected $m_sEncryptionKey;

-	/**
-	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
-	 *             unless you want to import a database from another iTop instance, in which case you must use
-	 *             the same encryption key in order to properly decode the encrypted fields
-	 */
-	protected $m_sEncryptionLibrary;
-
 	/**
 	 * @var array Additional character sets to be supported by the interactive CSV import
 	 *            'iconv_code' => 'display name'
 	 */
 	protected $m_aCharsets;

-    /**
-     * Config constructor.
-     *
-     * @param string|null $sConfigFile
-     * @param bool $bLoadConfig
-     *
-     * @throws \ConfigException
-     * @throws \CoreException
-     */
-    public function __construct($sConfigFile = null, $bLoadConfig = true)
+	public function __construct($sConfigFile = null, $bLoadConfig = true)
 	{
 		$this->m_sFile = $sConfigFile;
 		if (is_null($sConfigFile))
@@ -1336,14 +1258,10 @@ class Config
 		$this->m_sDefaultLanguage = 'EN US';
 		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
 		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
+		$this->m_sEncryptionKey = DEFAULT_ENCRYPTION_KEY;
 		$this->m_aCharsets = array();
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;

-		//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_aModuleSettings = array();

 		if ($bLoadConfig)
@@ -1368,13 +1286,7 @@ class Config
 		 */
 	}

-    /**
-     * @param string $sPurpose
-     * @param string $sFileName
-     *
-     * @throws \ConfigException
-     */
-    protected function CheckFile($sPurpose, $sFileName)
+	protected function CheckFile($sPurpose, $sFileName)
 	{
 		if (!file_exists($sFileName))
 		{
@@ -1424,12 +1336,6 @@ class Config
 			throw new ConfigException('Error in configuration file',
 				array('file' => $sConfigFile, 'error' => $e->getMessage()));
 		}
-		catch(Error $e)
-		{
-		    // PHP 7
-		    throw new ConfigException('Error in configuration file',
-		        array('file' => $sConfigFile, 'error' => $e->getMessage().' at line '.$e->getLine()));
-		}
 		if (strlen($sNoise) > 0)
 		{
 			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
@@ -1489,8 +1395,7 @@ class Config
 		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
 		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
 		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
-		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : $this->m_sEncryptionKey;
-		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
+		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : DEFAULT_ENCRYPTION_KEY;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
 	}

@@ -1511,14 +1416,7 @@ class Config
 		return $this->GetModuleParameter($sModule, $sProperty, $defaultvalue);
 	}

-    /**
-     * @param string $sModule
-     * @param string $sProperty
-     * @param mixed|null $defaultvalue
-     *
-     * @return mixed|null
-     */
-    public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
+	public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
 	{
 		$ret = $defaultvalue;
 		if (class_exists('ModulesXMLParameters'))
@@ -1550,7 +1448,6 @@ class Config

 	/**
 	 * @return string
-	 *
 	 * @deprecated 2.5 will be removed in 2.6
 	 * @see Config::Get() as a replacement
 	 */
@@ -1561,7 +1458,6 @@ class Config

 	/**
 	 * @return string
-	 *
 	 * @deprecated 2.5 will be removed in 2.6
 	 * @see Config::Get() as a replacement
 	 */
@@ -1572,7 +1468,6 @@ class Config

 	/**
 	 * @return string
-	 *
 	 * @deprecated 2.5 will be removed in 2.6
 	 * @see Config::Get() as a replacement
 	 */
@@ -1583,8 +1478,7 @@ class Config

 	/**
 	 * @return string
-	 *
-	 * @deprecated 2.5 will be removed in 2.6 N°1001 utf8mb4 switch
+	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
 	 * @see Config::DEFAULT_CHARACTER_SET
 	 */
 	public function GetDBCharacterSet()
@@ -1594,8 +1488,7 @@ class Config

 	/**
 	 * @return string
-	 *
-	 * @deprecated 2.5 will be removed in 2.6 N°1001 utf8mb4 switch
+	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
 	 * @see Config::DEFAULT_COLLATION
 	 */
 	public function GetDBCollation()
@@ -1605,7 +1498,6 @@ class Config

 	/**
 	 * @return string
-	 *
 	 * @deprecated 2.5 will be removed in 2.6
 	 * @see Config::Get() as a replacement
 	 */
@@ -1616,7 +1508,6 @@ class Config

 	/**
 	 * @return string
-	 *
 	 * @deprecated 2.5 will be removed in 2.6
 	 * @see Config::Get() as a replacement
 	 */
@@ -1690,11 +1581,6 @@ class Config
 		return $this->m_sEncryptionKey;
 	}

-	public function GetEncryptionLibrary()
-	{
-		return $this->m_sEncryptionLibrary;
-	}
-
 	public function GetAllowedLoginTypes()
 	{
 		return explode('|', $this->m_sAllowedLoginTypes);
@@ -1823,7 +1709,6 @@ class Config
 		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
 		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
 		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
-		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;

 		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
@@ -1841,16 +1726,14 @@ 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 $sFileName string Name of the file to write to (emtpy to write to the same file)
+	 *
+	 * @return boolean True otherwise throws an Exception
+	 */
 	public function WriteToFile($sFileName = '')
 	{
 		if (empty($sFileName))
@@ -1912,7 +1795,6 @@ class Config
 				'allowed_login_types' => $this->m_sAllowedLoginTypes,
 				'ext_auth_variable' => $this->m_sExtAuthVariable,
 				'encryption_key' => $this->m_sEncryptionKey,
-				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
 			);
 			foreach ($aOtherValues as $sKey => $value)
@@ -1998,16 +1880,9 @@ 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
+	 */
 	public function UpdateFromParams($aParamValues, $sModulesDir = null, $bPreserveModuleSettings = false)
 	{
 		if (isset($aParamValues['application_path']))
@@ -2137,13 +2012,9 @@ class Config
 		}
 	}

-    /**
-     * 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
+	 */
 	protected static function ChangePrefix(&$aStrings, $sSearchPrefix, $sNewPrefix)
 	{
 		foreach ($aStrings as &$sFile)
@@ -2155,13 +2026,10 @@ 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
+	 */
 	public function ChangeModulesPath($sSourceEnv, $sTargetEnv)
 	{
 		// Now does nothing since the includes are built into the environment itself
@@ -2198,3 +2066,5 @@ class Config
 	}

 }
+
+?>
--- a/core/coreexception.class.inc.php
+++ b/core/coreexception.class.inc.php
@@ -107,81 +107,6 @@ class CoreException extends Exception
 	}
 }

-/**
- * Class CoreCannotSaveObjectException
- *
- * Specialized exception to raise if {@link DBObject::CheckToWrite()} fails, which allow easy data retrieval
- *
- * @see \DBObject::DBInsertNoReload()
- * @see \DBObject::DBUpdate()
- *
- * @since 2.6 N°659 uniqueness constraint
- */
-class CoreCannotSaveObjectException extends CoreException
-{
-	/** @var string[] */
-	private $aIssues;
-	/** @var int */
-	private $iObjectId;
-	/** @var string */
-	private $sObjectClass;
-
-	/**
-	 * CoreCannotSaveObjectException constructor.
-	 *
-	 * @param array $aContextData containing at least those keys : issues, id, class
-	 */
-	public function __construct($aContextData)
-	{
-		$this->aIssues = $aContextData['issues'];
-		$this->iObjectId = $aContextData['id'];
-		$this->sObjectClass = $aContextData['class'];
-
-		$sIssues = implode(', ', $this->aIssues);
-		parent::__construct($sIssues, $aContextData);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getHtmlMessage()
-	{
-		$sTitle = Dict::S('UI:Error:SaveFailed');
-		$sContent = "<span><strong>{$sTitle}</strong></span>";
-
-		if (count($this->aIssues) == 1)
-		{
-			$sContent .= " <span>{$this->aIssues[0]}</span>";
-		}
-		else
-		{
-			$sContent .= '<ul>';
-			foreach ($this->aIssues as $sError)
-			{
-				$sContent .= "<li>$sError</li>";
-			}
-			$sContent .= '</ul>';
-		}
-
-		return $sContent;
-	}
-
-	public function getIssues()
-	{
-		return $this->aIssues;
-	}
-
-	public function getObjectId()
-	{
-		return $this->iObjectId;
-	}
-
-	public function getObjectClass()
-	{
-		return $this->sObjectClass;
-	}
-}
-
 class CoreWarning extends CoreException
 {
 }
@@ -202,3 +127,5 @@ class SecurityException extends CoreException
 class ArchivedObjectException extends CoreException
 {
 }
+
+?>
--- a/core/csvbulkexport.class.inc.php
+++ b/core/csvbulkexport.class.inc.php
@@ -266,7 +266,7 @@ EOF
 			if ($this->aStatusInfo['charset'] != 'UTF-8')
 			{
 				// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
-				// and thus to convert field by field and not the whole row or file at once (see ticket N°991)
+				// and thus to convert field by field and not the whole row or file at once (see ticket #991)
 				$aData[$idx] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $aData[$idx]);
 			}
 		}
@@ -325,7 +325,7 @@ EOF
 				if ($this->aStatusInfo['charset'] != 'UTF-8')
 				{
 					// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
-					// and thus to convert field by field and not the whole row or file at once (see ticket N°991)
+					// and thus to convert field by field and not the whole row or file at once (see ticket #991)
 					$aData[] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $sField);
 				}
 				else
--- a/core/data.generator.class.inc.php
+++ b/core/data.generator.class.inc.php
@@ -335,7 +335,7 @@ class cmdbDataGenerator
 	 */
 	protected function CleanForEmail($sText)
 	{
-		return str_replace(array("'", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
+		return str_replace(array("'", "é", "è", "ê", "ç", "à", "â", "ñ", "ö", "ä"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
 	}

 	/**
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design>
  <user_rights>
    <profiles>
      <profile id="1024" _delta="define">
@@ -9,250 +9,4 @@
      </profile>
    </profiles>
  </user_rights>
-  <meta>
-    <classes>
-      <class id="User" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>core,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="contactid" xsi:type="AttributeExternalKey">
-            <target_class>Person</target_class>
-          </field>
-          <field id="last_name" xsi:type="AttributeExternalField"/>
-          <field id="first_name" xsi:type="AttributeExternalField"/>
-          <field id="email" xsi:type="AttributeExternalField"/>
-          <field id="org_id" xsi:type="AttributeExternalField"/>
-          <field id="login" xsi:type="AttributeString"/>
-          <field id="language" xsi:type="AttributeApplicationLanguage"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="profile_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="allowed_org_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="finalclass" xsi:type="AttributeFinalClass"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="contactid_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="contactid_obsolescence_flag" xsi:type="AttributeExternalField"/>
-          <field id="org_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="org_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="URP_Profiles" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>addon/userrights,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="user_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
-      <class id="URP_UserProfile" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>addon/userrights,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="userid" xsi:type="AttributeExternalKey">
-            <target_class>User</target_class>
-          </field>
-          <field id="userlogin" xsi:type="AttributeExternalField"/>
-          <field id="profileid" xsi:type="AttributeExternalKey">
-            <target_class>URP_Profiles</target_class>
-          </field>
-          <field id="profile" xsi:type="AttributeExternalField"/>
-          <field id="reason" xsi:type="AttributeString"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="userid_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="userid_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="profileid_friendlyname" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="URP_UserOrg" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>addon/userrights,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="userid" xsi:type="AttributeExternalKey">
-            <target_class>User</target_class>
-          </field>
-          <field id="userlogin" xsi:type="AttributeExternalField"/>
-          <field id="allowed_org_id" xsi:type="AttributeExternalKey">
-            <target_class>Organization</target_class>
-          </field>
-          <field id="allowed_org_name" xsi:type="AttributeExternalField"/>
-          <field id="reason" xsi:type="AttributeString"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="userid_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="userid_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="allowed_org_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="allowed_org_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="Action" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>grant_by_profile,core/cmdb</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="trigger_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="finalclass" xsi:type="AttributeFinalClass"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
-      <class id="Trigger" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>grant_by_profile,core/cmdb</category>
-        </properties>
-        <fields>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="action_list" xsi:type="AttributeLinkedSetIndirect"/>
-          <field id="finalclass" xsi:type="AttributeFinalClass"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
-      <class id="SynchroDataSource" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeText"/>
-          <field id="status" xsi:type="AttributeEnum"/>
-          <field id="user_id" xsi:type="AttributeExternalKey">
-            <target_class>User</target_class>
-          </field>
-          <field id="notify_contact_id" xsi:type="AttributeExternalKey">
-            <target_class>Contact</target_class>
-          </field>
-          <field id="scope_class" xsi:type="AttributeClass"/>
-          <field id="database_table_name" xsi:type="AttributeString"/>
-          <field id="scope_restriction" xsi:type="AttributeString"/>
-          <field id="full_load_periodicity" xsi:type="AttributeDuration"/>
-          <field id="reconciliation_policy" xsi:type="AttributeEnum"/>
-          <field id="action_on_zero" xsi:type="AttributeEnum"/>
-          <field id="action_on_one" xsi:type="AttributeEnum"/>
-          <field id="action_on_multiple" xsi:type="AttributeEnum"/>
-          <field id="delete_policy" xsi:type="AttributeEnum"/>
-          <field id="delete_policy_update" xsi:type="AttributeString"/>
-          <field id="delete_policy_retention" xsi:type="AttributeDuration"/>
-          <field id="attribute_list" xsi:type="AttributeLinkedSet"/>
-          <field id="user_delete_policy" xsi:type="AttributeEnum"/>
-          <field id="url_icon" xsi:type="AttributeURL"/>
-          <field id="url_application" xsi:type="AttributeString"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="user_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="user_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="notify_contact_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="notify_contact_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="notify_contact_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="SynchroAttribute" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="sync_source_id" xsi:type="AttributeExternalKey">
-            <target_class>SynchroDataSource</target_class>
-          </field>
-          <field id="sync_source_name" xsi:type="AttributeExternalField"/>
-          <field id="attcode" xsi:type="AttributeString"/>
-          <field id="update" xsi:type="AttributeBoolean"/>
-          <field id="reconcile" xsi:type="AttributeBoolean"/>
-          <field id="update_policy" xsi:type="AttributeEnum"/>
-          <field id="finalclass" xsi:type="AttributeFinalClass"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="sync_source_id_friendlyname" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="AuditRule" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>application, grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="query" xsi:type="AttributeOQL"/>
-          <field id="valid_flag" xsi:type="AttributeEnum"/>
-          <field id="category_id" xsi:type="AttributeExternalKey">
-            <target_class>AuditCategory</target_class>
-          </field>
-          <field id="category_name" xsi:type="AttributeExternalField"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="category_id_friendlyname" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-      <class id="AuditCategory" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>application, grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeString"/>
-          <field id="definition_set" xsi:type="AttributeOQL"/>
-          <field id="rules_list" xsi:type="AttributeLinkedSet"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
-      <class id="Query" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>core/cmdb,view_in_gui,application,grant_by_profile</category>
-        </properties>
-        <fields>
-          <field id="name" xsi:type="AttributeString"/>
-          <field id="description" xsi:type="AttributeText"/>
-          <field id="fields" xsi:type="AttributeText"/>
-          <field id="finalclass" xsi:type="AttributeFinalClass"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-        </fields>
-      </class>
-      <class id="lnkTriggerAction" _delta="define">
-        <!-- Generated by toolkit/export-class-to-meta.php -->
-        <parent>cmdbAbstractObject</parent>
-        <properties>
-          <category>grant_by_profile,core/cmdb,application</category>
-        </properties>
-        <fields>
-          <field id="action_id" xsi:type="AttributeExternalKey">
-            <target_class>Action</target_class>
-          </field>
-          <field id="action_name" xsi:type="AttributeExternalField"/>
-          <field id="trigger_id" xsi:type="AttributeExternalKey">
-            <target_class>Trigger</target_class>
-          </field>
-          <field id="trigger_name" xsi:type="AttributeExternalField"/>
-          <field id="order" xsi:type="AttributeInteger"/>
-          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
-          <field id="action_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="action_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-          <field id="trigger_id_friendlyname" xsi:type="AttributeExternalField"/>
-          <field id="trigger_id_finalclass_recall" xsi:type="AttributeExternalField"/>
-        </fields>
-      </class>
-    </classes>
-  </meta>
 </itop_design>
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -101,11 +101,6 @@ class DBObjectSearch extends DBSearch
 	/**
 	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
 	 * Defaults to the first selected class (most of the time it is also the first joined class	 
-	 *
-	 * @param $sNewClass
-	 * @param null $sAlias
-	 *
-	 * @throws \CoreException
 	 */	 	
 	public function ChangeClass($sNewClass, $sAlias = null)
 	{
@@ -191,9 +186,7 @@ class DBObjectSearch extends DBSearch
 	 *
 	 * @param $sOldName
 	 * @param $sNewName
-	 *
 	 * @return bool True if the alias has been found and changed
-	 * @throws \Exception
 	 */
 	public function RenameAlias($sOldName, $sNewName)
 	{
@@ -388,7 +381,7 @@ class DBObjectSearch extends DBSearch
 			else
 			{
 				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
-				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
+				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams, $bParseSearchString);
 				$this->AddConditionExpression($oNewCondition);
 				return;
 			}
@@ -480,11 +473,6 @@ class DBObjectSearch extends DBSearch
 				$oNewCondition = Expression::FromOQL($sOQLCondition);
 				break;

-			case 'MATCHES':
-				$oRightExpr = new ScalarExpression($value);
-				$oNewCondition = new MatchExpression($oField, $oRightExpr);
-				break;
-
 			case 'Contains':
 			case 'Begins with':
 			case 'Finishes with':
@@ -502,8 +490,6 @@ class DBObjectSearch extends DBSearch
 	 * @param bool $bPositiveMatch if true will add a IN filter, else a NOT IN
 	 *
 	 * @throws \CoreException
-	 *
-	 * @since 2.5 N°1418
 	 */
 	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
 	{
@@ -513,22 +499,33 @@ class DBObjectSearch extends DBSearch

 		$sInParamName = $this->GenerateUniqueParamName();
 		$oParamExpression = new VariableExpression($sInParamName);
-		$this->GetInternalParamsByRef()[$sInParamName] = $aValues;
+		$this->SetInternalParams(array($sInParamName => $aValues));

-		$oListExpression = new ListExpression(array($oParamExpression));
-
-		$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oListExpression);
+		$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oParamExpression);
 		$this->AddConditionExpression($oInCondition);
 	}

+	/**
+	 * @return string a unique param name
+	 */
+	private function GenerateUniqueParamName() {
+		$iExistingParamsNb = count($this->m_aParams);
+		$iCurrentArrayParamNb = $iExistingParamsNb + 1;
+		$sParamName = 'param'.$iCurrentArrayParamNb;
+
+		if (isset($this->m_aParams[$sParamName])) {
+			$sParamName .= '_'.microtime(true) . '_' .rand(0,100);
+		}
+
+		return $sParamName;
+	}
+
 	/**
 	 * Specify a condition on external keys or link sets
-	 * @param string $sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
 	 *                 Example: infra_list->ci_id->location_id->country	 
-	 * @param $value
+	 * @param value The value to match (can be an array => IN(val1, val2...)
 	 * @return void
-	 * @throws \CoreException
-	 * @throws \CoreWarning
 	 */
 	public function AddConditionAdvanced($sAttSpec, $value)
 	{
@@ -725,9 +722,9 @@ class DBObjectSearch extends DBSearch
 	 * - convert a translation table (format optimized for the translation in an expression tree) into simple hash
 	 * - compile over an eventually existing map
 	 *
-	 * @param array $aRealiasingMap Map to update
-	 * @param array $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
-	 * @return void of <old-alias> => <new-alias>
+	 * @param $aRealiasingMap  Map to update
+	 * @param $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
+	 * @return array of <old-alias> => <new-alias>
 	 */
 	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
 	{
@@ -757,7 +754,7 @@ class DBObjectSearch extends DBSearch
 	 * This a workaround to handle some cases in which the list of classes is not correctly updated.
 	 * This code should disappear as soon as DBObjectSearch get split between a container search class and a Node class
 	 *
-	 * @param array $aClasses List to be completed
+	 * @param $aClasses List to be completed
 	 */
 	protected function RecomputeClassList(&$aClasses)
 	{
@@ -877,8 +874,6 @@ class DBObjectSearch extends DBSearch
 	 * @param $sForeignExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 * @return void
-	 * @throws \CoreException
 	 */
 	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
 	{
@@ -901,7 +896,7 @@ class DBObjectSearch extends DBSearch
 		// NO: $oFilter = $oFilter->DeepClone();
 		// See also: Trac #639, and self::AddCondition_PointingTo()
 		$aAliasTranslation = array();
-		$this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
+		$res = $this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
 		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
 		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);

@@ -925,6 +920,7 @@ class DBObjectSearch extends DBSearch
 			}
 		}
 		$this->RecomputeClassList($this->m_aClasses);
+		return $res;
 	}

 	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
@@ -983,10 +979,7 @@ class DBObjectSearch extends DBSearch
 			$oRightFilter = $oRightFilter->DeepClone();

 			$bAllowAllData = ($oLeftFilter->IsAllDataAllowed() && $oRightFilter->IsAllDataAllowed());
-			if ($bAllowAllData)
-			{
-				$oLeftFilter->AllowAllData();
-			}
+			$oLeftFilter->AllowAllData($bAllowAllData);

 			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
 			{
@@ -1078,45 +1071,11 @@ class DBObjectSearch extends DBSearch
 		return $this->m_aParams = $aParams;
 	}

-	/**
-	 * @return array <strong>warning</strong> : array returned by value
-	 * @see self::GetInternalParamsByRef to get the attribute by reference
-	 */
 	public function GetInternalParams()
 	{
 		return $this->m_aParams;
 	}

-	/**
-	 * @return array
-	 * @see http://php.net/manual/en/language.references.return.php
-	 * @since 2.5.1 N°1582
-	 */
-	public function &GetInternalParamsByRef()
-	{
-		return $this->m_aParams;
-	}
-
-	/**
-	 * @param string $sKey
-	 * @param mixed $value
-	 * @param bool $bDoNotOverride
-	 *
-	 * @throws \CoreUnexpectedValue if $bDoNotOverride and $sKey already exists
-	 */
-	public function AddInternalParam($sKey, $value, $bDoNotOverride = false)
-	{
-		if ($bDoNotOverride)
-		{
-			if (array_key_exists($sKey, $this->m_aParams))
-			{
-				throw new CoreUnexpectedValue("The key $sKey already exists with value : ".$this->m_aParams[$sKey]);
-			}
-		}
-
-		$this->m_aParams[$sKey] = $value;
-	}
-
 	public function GetQueryParams($bExcludeMagicParams = true)
 	{
 		$aParams = array();
@@ -1169,13 +1128,113 @@ class DBObjectSearch extends DBSearch
 	/**
 	 * Turn the parameters (:xxx) into scalar values in order to easily
 	 * serialize a search
-	 * @param $aArgs
-*/
+	 */
 	public function ApplyParameters($aArgs)
 	{
-		$this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
+		return $this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
 	}

+    /**
+     *
+     * @todo: check if the clone is mandatory or optional. (the performance would be better without cloning)
+     *
+     * @param bool $bClone
+     *
+     * @return DBObjectSearch|DBSearch
+     */
+	public function ShorthandExpansion($bClone = false)
+    {
+        if ($bClone)
+        {
+            $oDbObject = $this->DeepClone();
+        }
+        else
+        {
+            $oDbObject = $this;
+        }
+
+        /**
+         * This callback add joins based on the classes found inside ExternalFieldExpression::$aFields
+         * to do so, it is applied on each Expression of $this->m_oSearchCondition.
+         *
+         * @param $oExpression
+         */
+        $callback = function ($oExpression) use ($oDbObject)
+        {
+            if (!$oExpression instanceof ExternalFieldExpression) {
+                return;
+            }
+
+
+            /** @var FieldExpression[] $aFieldExpressionsPointingTo */
+            $aFields = $oExpression->GetFields();
+
+            $aRealiasingMap = array();
+            $aExpressionNewConditions = array();
+            foreach ($aFields as $aFieldExpressionPointingTo)
+            {
+                $oFilter = new DBObjectSearch($aFieldExpressionPointingTo['sClass']);
+                $aExpressionNewConditions[] = array(
+                    'oFilter' => $oFilter,
+                    'sExtKeyAttCode' => $aFieldExpressionPointingTo['sAttCode'],
+                );
+
+                $aRealiasingMap[$aFieldExpressionPointingTo['sClass']] = $aFieldExpressionPointingTo['sAlias'];
+
+            }
+
+
+            /**
+             * the iteration below is weird because wee need to
+             * - iterate in the reverse order
+             * - the iteration access the "index+1" so wee start at "length-1" (which is "count()-2")
+             * - whe stop at the index 1, because the index 0 is merged into the $oDbObject
+             */
+            for ($i = count($aExpressionNewConditions) - 2; $i > 0; $i--)
+            {
+                $aExpressionNewConditions[$i]['oFilter']->AddCondition_PointingTo(
+                    $aExpressionNewConditions[$i+1]['oFilter'],
+                    $aExpressionNewConditions[$i]['sExtKeyAttCode'],
+                    TREE_OPERATOR_EQUALS,
+                    $aRealiasingMap
+                );
+            }
+
+
+            $oDbObject->AddCondition_PointingTo(
+                $aExpressionNewConditions[1]['oFilter'],
+                $aExpressionNewConditions[0]['sExtKeyAttCode'],
+                TREE_OPERATOR_EQUALS,
+                $aRealiasingMap
+            );
+
+            foreach ($aRealiasingMap as $sOldAlias => $sNewAlias)
+            {
+                if ($sOldAlias == $sNewAlias)
+                {
+                    continue;
+                }
+
+                if ($sOldAlias != $aFields['sAlias'])
+                {
+                    continue;
+                }
+                $aFields['sAlias'] = $sNewAlias;
+            }
+
+            $oExpression->SetFields($aFields);
+        }; //end of the callback definition
+
+
+        //Add the joins
+        $this->m_oSearchCondition->Browse($callback);
+
+        //replace the ExternalFieldExpression by a FieldExpression (based on last ExternalFieldExpression::$aFields)
+        $this->m_oSearchCondition->Translate(array(), false, false);//TODO: check if this call is correct
+
+        return $oDbObject;
+    }
+
 	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
 	{
 		// Currently unused, but could be useful later
@@ -1304,12 +1363,22 @@ class DBObjectSearch extends DBSearch
 			$oRight = $this->OQLExpressionToCondition($sQuery, $oExpression->GetRightExpr(), $aClassAliases);
 			return new BinaryExpression($oLeft, $sOperator, $oRight);
 		}
-		elseif ($oExpression instanceof MatchOqlExpression)
+		elseif ($oExpression instanceof ExternalFieldOqlExpression)
 		{
-			$oLeft = $this->OQLExpressionToCondition($sQuery, $oExpression->GetLeftExpr(), $aClassAliases);
-			$oRight = $this->OQLExpressionToCondition($sQuery, $oExpression->GetRightExpr(), $aClassAliases);
+			//TODO : convert FieldOqlExpression[] to FieldExpression[]
+            $aOqlFieldExpression = $oExpression->GetExpressions();
+            $aFields = array();

-			return new MatchExpression($oLeft, $oRight);
+            foreach ($aOqlFieldExpression as $oOqlFieldExpression)
+            {
+                $aFields[] = array(
+                    'sClass'    => $oOqlFieldExpression->GetParent(),
+                    'sAlias'    => $oOqlFieldExpression->GetParent(),
+                    'sAttCode'  => $oOqlFieldExpression->GetName(),
+                );
+            }
+
+		    return new ExternalFieldExpression($oExpression->GetName(), $aFields);
 		}
 		elseif ($oExpression instanceof FieldOqlExpression)
 		{
@@ -1549,6 +1618,11 @@ class DBObjectSearch extends DBSearch
 				$oSearch = $this->Intersect($oVisibleObjects);
 				$oSearch->SetDataFiltered();
 			}
+			else
+			{
+				// should be true at this point, meaning that no additional filtering
+				// is required
+			}
 		}

 		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
@@ -1574,7 +1648,7 @@ class DBObjectSearch extends DBSearch
 				$aContextData['sRequestUri'] = '';
 			}

-			// Need to identify the query
+			// Need to identify the querySELECT `Contact` FROM Contact AS `Contact` JOIN Organization AS `Organization` ON `Contact`.org_id = `Organization`.id JOIN DeliveryModel AS `DeliveryModel` ON `Organization`.deliverymodel_id = `DeliveryModel`.id WHERE ((((Contact.org_id->deliverymodel_id->name = 'Standard support') AND 1) AND 1) AND 1)
 			$sOqlQuery = $oSearch->ToOql(false, null, true);
 			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
 			{
@@ -1680,7 +1754,8 @@ class DBObjectSearch extends DBSearch

 		if (!isset($oSQLQuery))
 		{
-			$oKPI = new ExecutionKPI();
+            $oSearch = $oSearch->ShorthandExpansion(true);//TODO : check if the clone is really needed (1st param of ShorthandExpansion)
+		    $oKPI = new ExecutionKPI();
 			$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);

@@ -1707,9 +1782,7 @@ class DBObjectSearch extends DBSearch
 	 * @param array $aGroupByExpr
 	 * @param array $aSelectedClasses
 	 * @param array $aSelectExpr
-	 *
 	 * @return null|SQLObjectQuery
-	 * @throws \CoreException
 	 */
 	protected function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
@@ -1717,7 +1790,7 @@ class DBObjectSearch extends DBSearch

 		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, array());
 		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-		if (is_array($aGroupByExpr))
+		if ($aGroupByExpr)
 		{
 			$aCols = $oBuild->m_oQBExpressions->GetGroupBy();
 			$oSQLQuery->SetGroupBy($aCols);
@@ -1771,7 +1844,6 @@ class DBObjectSearch extends DBSearch
 	 * @param null $aAttToLoad
 	 * @param array $aValues
 	 * @return null|SQLObjectQuery
-	 * @throws \CoreException
 	 */
 	protected function MakeSQLObjectQuery(&$oBuild, $aAttToLoad = null, $aValues = array())
 	{
@@ -1937,86 +2009,46 @@ class DBObjectSearch extends DBSearch
 			}
 		}

-		$bRootFirst = MetaModel::GetConfig()->Get('optimize_requests_for_join_count');
-		if ($bRootFirst)
+		// First query built from the root, adding all tables including the leaf
+		//   Before N.1065 we were joining from the leaf first, but this wasn't a good choice :
+		//   most of the time (obsolescence, friendlyname, ...) we want to get a root attribute !
+		//
+		$oSelectBase = null;
+		$aClassHierarchy = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, true);
+		$bIsClassStandaloneClass = (count($aClassHierarchy) == 1);
+		foreach($aClassHierarchy as $sSomeClass)
 		{
-			// First query built from the root, adding all tables including the leaf
-			//   Before N.1065 we were joining from the leaf first, but this wasn't a good choice :
-			//   most of the time (obsolescence, friendlyname, ...) we want to get a root attribute !
-			//
-			$oSelectBase = null;
-			$aClassHierarchy = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, true);
-			$bIsClassStandaloneClass = (count($aClassHierarchy) == 1);
-			foreach($aClassHierarchy as $sSomeClass)
+			if (!MetaModel::HasTable($sSomeClass))
 			{
-				if (!MetaModel::HasTable($sSomeClass))
-				{
-					continue;
-				}
-
-				self::DbgTrace("Adding join from root to leaf: $sSomeClass... let's call MakeSQLObjectQuerySingleTable()");
-				$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSomeClass, $aExtKeys, $aValues);
-				if (is_null($oSelectBase))
-				{
-					$oSelectBase = $oSelectParentTable;
-					if (!$bIsClassStandaloneClass && (MetaModel::IsRootClass($sSomeClass)))
-					{
-						// As we're linking to root class first, we're adding a where clause on the finalClass attribute :
-						//      COALESCE($sRootClassFinalClass IN ('$sExpectedClasses'), 1)
-						// If we don't, the child classes can be removed in the query optimisation phase, including the leaf that was queried
-						// So we still need to filter records to only those corresponding to the child classes !
-						// The coalesce is mandatory if we have a polymorphic query (left join)
-						$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
-						$sFinalClassSqlColumnName = MetaModel::DBGetClassField($sSomeClass);
-						$oClassExpr = new FieldExpression($sFinalClassSqlColumnName, $oSelectBase->GetTableAlias());
-						$oInExpression = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
-						$oTrueExpression = new TrueExpression();
-						$aCoalesceAttr = array($oInExpression, $oTrueExpression);
-						$oFinalClassRestriction = new FunctionExpression("COALESCE", $aCoalesceAttr);
-
-						$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
-					}
-				}
-				else
-				{
-					$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sSomeClass));
-				}
+				continue;
 			}
-		}
-		else
-		{
-			// First query built upon on the leaf (ie current) class
-			//
-			self::DbgTrace("Main (=leaf) class, call MakeSQLObjectQuerySingleTable()");
-			if (MetaModel::HasTable($sClass))
+
+			self::DbgTrace("Adding join from root to leaf: $sSomeClass... let's call MakeSQLObjectQuerySingleTable()");
+			$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSomeClass, $aExtKeys, $aValues);
+			if (is_null($oSelectBase))
 			{
-				$oSelectBase = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sClass, $aExtKeys, $aValues);
+				$oSelectBase = $oSelectParentTable;
+				if (!$bIsClassStandaloneClass && (MetaModel::IsRootClass($sSomeClass)))
+				{
+					// As we're linking to root class first, we're adding a where clause on the finalClass attribute :
+					//      COALESCE($sRootClassFinalClass IN ('$sExpectedClasses'), 1)
+					// If we don't, the child classes can be removed in the query optimisation phase, including the leaf that was queried
+					// So we still need to filter records to only those corresponding to the child classes !
+					// The coalesce is mandatory if we have a polymorphic query (left join)
+					$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
+					$sFinalClassSqlColumnName = MetaModel::DBGetClassField($sSomeClass);
+					$oClassExpr = new FieldExpression($sFinalClassSqlColumnName, $oSelectBase->GetTableAlias());
+					$oInExpression = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+					$oTrueExpression = new TrueExpression();
+					$aCoalesceAttr = array($oInExpression, $oTrueExpression);
+					$oFinalClassRestriction = new FunctionExpression("COALESCE", $aCoalesceAttr);
+
+					$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
+				}
 			}
 			else
 			{
-				$oSelectBase = null;
-
-				// As the join will not filter on the expected classes, we have to specify it explicitely
-				$sExpectedClasses = implode("', '", MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
-				$oFinalClassRestriction = Expression::FromOQL("`$sClassAlias`.finalclass IN ('$sExpectedClasses')");
-				$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
-			}
-
-			// Then we join the queries of the eventual parent classes (compound model)
-			foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
-			{
-				if (!MetaModel::HasTable($sParentClass)) continue;
-
-				self::DbgTrace("Parent class: $sParentClass... let's call MakeSQLObjectQuerySingleTable()");
-				$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sParentClass, $aExtKeys, $aValues);
-				if (is_null($oSelectBase))
-				{
-					$oSelectBase = $oSelectParentTable;
-				}
-				else
-				{
-					$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sParentClass));
-				}
+				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sSomeClass));
 			}
 		}

@@ -2292,7 +2324,7 @@ class DBObjectSearch extends DBSearch
 							self::DbgTrace("External key $sKeyAttCode, Join on $sLocalKeyField = $sExternalKeyField");
 							if ($oKeyAttDef->IsNullAllowed())
 							{
-								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField);
+								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField, $sExternalKeyTable);
 							}
 							else
 							{
@@ -2344,13 +2376,9 @@ class DBObjectSearch extends DBSearch
 	}

 	/**
-	 *    Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
-	 *    Simplifies the final expression by grouping classes having the same expression
-	 * @param $sClass
-	 * @param $sAttCode
-	 * @return \FunctionExpression|mixed|null
-	 * @throws \CoreException
-*/
+	 *	Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
+	 *	Simplifies the final expression by grouping classes having the same expression
+	 */
 	static public function GetPolymorphicExpression($sClass, $sAttCode)
 	{
 		$oExpression = ExpressionCache::GetCachedExpression($sClass, $sAttCode);
--- a/core/dbobjectset.class.php
+++ b/core/dbobjectset.class.php
@@ -38,7 +38,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	 */
 	protected $m_aAddedIds; // Ids of objects added (discrete lists)
 	/**
-	 * @var array array of (row => array of (classalias) => object/null) storing the objects added "in memory"
+	 * @var hash array of (row => array of (classalias) => object/null) storing the objects added "in memory"
 	 */
 	protected $m_aAddedObjects;
 	/**
@@ -77,20 +77,18 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * @var mysqli_result
 	 */
 	protected $m_oSQLResult;
-	protected $m_bSort;

 	/**
 	 * Create a new set based on a Search definition.
 	 * 
 	 * @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 $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
-	 * @param array $aExtendedDataSpec
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 * @param hash $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
+	 * @param hash $aExtendedDataSpec
 	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
 	 * @param int $iLimitStart Index of the first row to load (i.e. equivalent to MySQL's LIMIT start, count)
-	 * @param bool $bSort if false no order by is done
 	 */
-	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bSort = true)
+	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0)
 	{
 		$this->m_oFilter = $oFilter->DeepClone();
 		$this->m_aAddedIds = array();
@@ -100,7 +98,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		$this->m_aExtendedDataSpec = $aExtendedDataSpec;
 		$this->m_iLimitCount = $iLimitCount;
 		$this->m_iLimitStart = $iLimitStart;
-		$this->m_bSort = $bSort;

 		$this->m_iNumTotalDBRows = null;
 		$this->m_iNumLoadedDBRows = 0;
@@ -118,19 +115,12 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * @return string
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \MissingQueryArgument
-     */
 	public function __toString()
 	{
 		$sRet = '';
 		$this->Rewind();
 		$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n";
-        $sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
+		$sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
 		
 		$sRet .= $this->Count()." records<br/>\n";
 		if ($this->Count() > 0)
@@ -178,16 +168,13 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_oFilter->GetShowObsoleteData();
 	}

-    /**
-     * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
-     *
-     * @param array $aAttToLoad Format: alias => array of attribute_codes
-     *
-     * @return void
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     */
+	/**
+	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
+	 *
+	 * @param array $aAttToLoad Format: alias => array of attribute_codes
+	 * 
+	 * @return void
+	 */
 	public function OptimizeColumnLoad($aAttToLoad)
 	{
 		if (is_null($aAttToLoad))
@@ -259,15 +246,13 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Create a set (in-memory) containing just the given object
-     *
-     * @param \DBobject $oObject
-     *
-     * @return \DBObjectSet The singleton set
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Create a set (in-memory) containing just the given object
+	 * 
+	 * @param DBobject $oObject
+	 * 
+	 * @return DBObjectSet The singleton set
+	 */
 	static public function FromObject($oObject)
 	{
 		$oRetSet = self::FromScratch(get_class($oObject));
@@ -275,15 +260,13 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oRetSet;
 	}

-    /**
-     * Create an empty set (in-memory), for the given class (and its subclasses) of objects
-     *
-     * @param string $sClass The class (or an ancestor) for the objects to be added in this set
-     *
-     * @return \DBObjectSet The empty set
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Create an empty set (in-memory), for the given class (and its subclasses) of objects
+	 * 
+	 * @param string $sClass The class (or an ancestor) for the objects to be added in this set
+	 * 
+	 * @return DBObjectSet The empty set
+	 */
 	static public function FromScratch($sClass)
 	{
 		$oFilter = new DBObjectSearch($sClass);
@@ -294,16 +277,14 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oRetSet;
 	} 

-    /**
-     * Create a set (in-memory) with just one column (i.e. one object per row) and filled with the given array of objects
-     *
-     * @param string $sClass The class of the objects (must be a common ancestor to all objects in the set)
-     * @param array $aObjects The list of objects to add into the set
-     *
-     * @return \DBObjectSet
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Create a set (in-memory) with just one column (i.e. one object per row) and filled with the given array of objects
+	 * 
+	 * @param string $sClass The class of the objects (must be a common ancestor to all objects in the set)
+	 * @param array $aObjects The list of objects to add into the set
+	 * 
+	 * @return DBObjectSet
+	 */
 	static public function FromArray($sClass, $aObjects)
 	{
 		$oRetSet = self::FromScratch($sClass);
@@ -311,19 +292,17 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oRetSet;
 	} 

-    /**
-     * Create a set in-memory with several classes of objects per row (with one alias per "column")
-     *
-     * Limitation:
-     * The filter/OQL query representing such a set can not be rebuilt (only the first column will be taken into account)
-     *
-     * @param array $aClasses Format: array of (alias => class)
-     * @param array $aObjects Format: array of (array of (classalias => object))
-     *
-     * @return \DBObjectSet
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Create a set in-memory with several classes of objects per row (with one alias per "column")
+	 * 
+	 * Limitation:
+	 * The filter/OQL query representing such a set can not be rebuilt (only the first column will be taken into account)
+	 * 
+	 * @param hash $aClasses Format: array of (alias => class)
+	 * @param hash $aObjects Format: array of (array of (classalias => object))
+	 * 
+	 * @return DBObjectSet
+	 */
 	static public function FromArrayAssoc($aClasses, $aObjects)
 	{
 		// In a perfect world, we should create a complete tree of DBObjectSearch,
@@ -344,17 +323,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oRetSet;
 	} 

-    /**
-     * @param $oObject
-     * @param string $sLinkSetAttCode
-     * @param string $sExtKeyToRemote
-     *
-     * @return \DBObjectSet
-     *
-     * @throws \Exception
-     * @throws \ArchivedObjectException
-     * @throws \CoreException
-     */static public function FromLinkSet($oObject, $sLinkSetAttCode, $sExtKeyToRemote)
+	static public function FromLinkSet($oObject, $sLinkSetAttCode, $sExtKeyToRemote)
 	{
 		$oLinkAttCode = MetaModel::GetAttributeDef(get_class($oObject), $sLinkSetAttCode);
 		$oExtKeyAttDef = MetaModel::GetAttributeDef($oLinkAttCode->GetLinkedClass(), $sExtKeyToRemote);
@@ -374,13 +343,7 @@ class DBObjectSet implements iDBObjectSetIterator
     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
     *
     * @param bool $bWithId
-     *
     * @return array
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
     */
 	public function ToArray($bWithId = true)
 	{
@@ -400,14 +363,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $aRet;
 	} 

-    /**
-     * @return array
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
 	public function ToArrayOfValues()
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -463,11 +418,7 @@ class DBObjectSet implements iDBObjectSetIterator
     *
     * @param string $sAttCode
     * @param bool $bWithId
-     *
     * @return array
-     *
-     * @throws \Exception
-     * @throws \CoreException
     */
 	public function GetColumnAsArray($sAttCode, $bWithId = true)
 	{
@@ -487,16 +438,14 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $aRet;
 	}

-    /**
-     * Retrieve the DBSearch corresponding to the objects present in this set
-     *
-     * Limitation:
-     * This method will NOT work for sets with several columns (i.e. several objects per row)
-     *
-     * @return \DBObjectSearch
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * Retrieve the DBSearch corresponding to the objects present in this set
+	 * 
+	 * Limitation:
+	 * This method will NOT work for sets with several columns (i.e. several objects per row)
+	 * 
+	 * @return DBObjectSearch
+	 */
 	public function GetFilter()
 	{
 		// Make sure that we carry on the parameters of the set with the filter
@@ -543,20 +492,18 @@ class DBObjectSet implements iDBObjectSetIterator
 	/**
 	 * The list of all classes (one per column) which are part of this set
 	 * 
-	 * @return array Format: alias => class
+	 * @return hash Format: alias => class
 	 */
 	public function GetSelectedClasses()
 	{
 		return $this->m_oFilter->GetSelectedClasses();
 	}

-    /**
-     * The root class (i.e. highest ancestor in the MeaModel class hierarchy) for the first column on this set
-     *
-     * @return string The root class for the objects in the first column of the set
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * The root class (i.e. highest ancestor in the MeaModel class hierarchy) for the first column on this set
+	 * 
+	 * @return string The root class for the objects in the first column of the set
+	 */
 	public function GetRootClass()
 	{
 		return MetaModel::GetRootClass($this->GetClass());
@@ -565,7 +512,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	/**
 	 * The arguments used for building this set
 	 * 
-	 * @return array Format: parameter_name => value
+	 * @return hash Format: parameter_name => value
 	 */
 	public function GetArgs()
 	{
@@ -583,13 +530,11 @@ class DBObjectSet implements iDBObjectSetIterator
 		$this->m_iLimitStart = $iLimitStart;
 	}

-    /**
-     * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
-     *
-     * @param array $aOrderBy Format: [alias.]attcode => boolean (true = ascending, false = descending)
-     *
-     * @throws \MySQLException
-     */
+	/**
+	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
+	 *
+	 * @param hash $aOrderBy Format: [alias.]attcode => boolean (true = ascending, false = descending)
+	 */
 	public function SetOrderBy($aOrderBy)
 	{
 		if ($this->m_aOrderBy != $aOrderBy)
@@ -603,14 +548,11 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
-     *
-     * @param array $aAliases Format: alias => boolean (true = ascending, false = descending). If omitted, then it defaults to all the selected classes
-     *
-     * @throws \CoreException
-     * @throws \MySQLException
-     */
+	/**
+	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
+	 *
+	 * @param hash $aAliases Format: alias => boolean (true = ascending, false = descending). If omitted, then it defaults to all the selected classes
+	 */
 	public function SetOrderByClasses($aAliases = null)
 	{
 		if ($aAliases === null)
@@ -625,7 +567,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		$aAttributes = array();
 		foreach ($aAliases as $sAlias => $bClassDirection)
 		{
-			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClassName($sAlias)) as $sAttCode => $bAttributeDirection)
+			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClass($sAlias)) as $sAttCode => $bAttributeDirection)
 			{
 				$bDirection = $bClassDirection ? $bAttributeDirection : !$bAttributeDirection;
 				$aAttributes[$sAlias.'.'.$sAttCode] = $bDirection;
@@ -654,22 +596,15 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iLimitStart;
 	}

-    /**
-     * Get the sort order used for loading this set from the database
-     *
-     * Limitation: the sort order has no effect on objects added in-memory
-     *
-     * @return array Format: field_code => boolean (true = ascending, false = descending)
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * Get the sort order used for loading this set from the database
+	 * 
+	 * Limitation: the sort order has no effect on objects added in-memory
+	 * 
+	 * @return hash Format: field_code => boolean (true = ascending, false = descending)
+	 */
 	public function GetRealSortOrder()
 	{
-		if (!$this->m_bSort)
-		{
-			// No order by
-			return array();
-		}
 		// Get the class default sort order if not specified with the API
 		//
 		if (empty($this->m_aOrderBy))
@@ -682,12 +617,9 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Loads the set from the database. Actually performs the SQL query to retrieve the records from the DB.
-     *
-     * @throws \Exception
-     * @throws \MySQLException
-     */
+	/**
+	 * Loads the set from the database. Actually performs the SQL query to retrieve the records from the DB. 
+	 */
 	public function Load()
 	{
 		if ($this->m_bLoaded) return;
@@ -742,14 +674,11 @@ class DBObjectSet implements iDBObjectSetIterator
 		$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
 	}

-    /**
-     * @param string[] $aAttToLoad
-     *
-     * @return string SQL query
-     *
-     * @throws \CoreException
-     * @throws \MissingQueryArgument
-     */
+	/**
+	 * @param string[] $aAttToLoad
+	 *
+	 * @return string SQL query
+	 */
 	private function _makeSelectQuery($aAttToLoad)
 	{
 		if ($this->m_iLimitCount > 0)
@@ -766,20 +695,15 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $sSQL;
 	}

-    /**
-     * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into
-     * account the rows added in-memory.
-     *
-     * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a
-     * SetLimit
-     *
-     * @return int The total number of rows for this set.
-     *
-     * @throws \CoreException
-     * @throws \MissingQueryArgument
-     * @throws \MySQLException
-     * @throws \MySQLHasGoneAwayException
-     */
+	/**
+	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into
+	 * account the rows added in-memory.
+	 *
+	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a
+	 * SetLimit
+	 *
+	 * @return int The total number of rows for this set.
+	 */
 	public function Count()
 	{
 		if (is_null($this->m_iNumTotalDBRows))
@@ -796,76 +720,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
 	}
 	
-	/** Check if the count exceeds a given limit
-	 * @param $iLimit
-	 *
-	 * @return bool
-     *
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public function CountExceeds($iLimit)
-	{
-		if (is_null($this->m_iNumTotalDBRows))
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
-			$resQuery = CMDBSource::Query($sSQL);
-			if ($resQuery)
-			{
-				$aRow = CMDBSource::FetchArray($resQuery);
-				$iCount = intval($aRow['COUNT']);
-				CMDBSource::FreeResult($resQuery);
-			}
-			else
-			{
-				$iCount = 0;
-			}
-		}
-		else
-		{
-			$iCount = $this->m_iNumTotalDBRows;
-		}
-
-		return ($iCount > $iLimit);
-	}
-
-	/** Count only up to the given limit
-	 * @param $iLimit
-	 *
-	 * @return int
-     *
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public function CountWithLimit($iLimit)
-	{
-		if (is_null($this->m_iNumTotalDBRows))
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
-			$resQuery = CMDBSource::Query($sSQL);
-			if ($resQuery)
-			{
-				$aRow = CMDBSource::FetchArray($resQuery);
-				CMDBSource::FreeResult($resQuery);
-				$iCount = intval($aRow['COUNT']);
-			}
-			else
-			{
-				$iCount = 0;
-			}
-		}
-		else
-		{
-			$iCount = $this->m_iNumTotalDBRows;
-		}
-
-		return $iCount;
-	}
-
 	/**
 	 * Number of rows available in memory (loaded from DB + added in memory)
 	 * 
@@ -876,17 +730,12 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iNumLoadedDBRows + count($this->m_aAddedObjects);
 	}

-    /**
-     * Fetch the object (with the given class alias) at the current position in the set and move the cursor to the next position.
-     *
-     * @param string $sRequestedClassAlias The class alias to fetch (if there are several objects/classes per row)
-     *
-     * @return \DBObject The fetched object or null when at the end
-     *
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
+	/**
+	 * Fetch the object (with the given class alias) at the current position in the set and move the cursor to the next position.
+	 * 
+	 * @param string $sRequestedClassAlias The class alias to fetch (if there are several objects/classes per row)
+	 * @return DBObject The fetched object or null when at the end
+	 */
 	public function Fetch($sRequestedClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -930,15 +779,11 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oRetObj;
 	}

-    /**
-     * Fetch the whole row of objects (if several classes have been specified in the query) and move the cursor to the next position
-     *
-     * @return array An associative with the format 'classAlias' => $oObj representing the current row of the set. Returns null when at the end.
-     *
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
+	/**
+	 * Fetch the whole row of objects (if several classes have been specified in the query) and move the cursor to the next position
+	 * 
+	 * @return hash A hash with the format 'classAlias' => $oObj representing the current row of the set. Returns null when at the end.
+	 */
 	public function FetchAssoc()
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -981,8 +826,6 @@ class DBObjectSet implements iDBObjectSetIterator

 	/**
 	 * Position the cursor (for iterating in the set) to the first position (equivalent to Seek(0))
-     *
-     * @throws \Exception
 	 */
 	public function Rewind()
 	{
@@ -992,18 +835,11 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Position the cursor (for iterating in the set) to the given position
-     *
-     * @param int $iRow
-     *
-     * @return int|mixed
-     *
-     * @throws \CoreException
-     * @throws \MissingQueryArgument
-     * @throws \MySQLException
-     * @throws \MySQLHasGoneAwayException
-     */
+	/**
+	 * Position the cursor (for iterating in the set) to the given position
+	 * 
+	 * @param int $iRow
+	 */
 	public function Seek($iRow)
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -1016,17 +852,15 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $this->m_iCurrRow;
 	}

-    /**
-     * Add an object to the current set (in-memory only, nothing is written to the database)
-     *
-     * Limitation:
-     * Sets with several objects per row are NOT supported
-     *
-     * @param \DBObject $oObject The object to add
-     * @param string $sClassAlias The alias for the class of the object
-     *
-     * @throws \MySQLException
-     */
+	/**
+	 * Add an object to the current set (in-memory only, nothing is written to the database)
+	 * 
+	 * Limitation:
+	 * Sets with several objects per row are NOT supported
+	 * 
+	 * @param DBObject $oObject The object to add
+	 * @param string $sClassAlias The alias for the class of the object
+	 */
 	public function AddObject($oObject, $sClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -1044,18 +878,16 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Add a hash containig objects into the current set.
-     *
-     * The expected format for the hash is: $aObjectArray[$idx][$sClassAlias] => $oObject
-     * Limitation:
-     * The aliases MUST match the ones used in the current set
-     * Only the ID of the objects associated to the first alias (column) is remembered.. in case we have to rebuild a filter
-     *
-     * @param array $aObjectArray
-     *
-     * @throws \MySQLException
-     */
+	/**
+	 * Add a hash containig objects into the current set.
+	 * 
+	 * The expected format for the hash is: $aObjectArray[$idx][$sClassAlias] => $oObject
+	 * Limitation:
+	 * The aliases MUST match the ones used in the current set
+	 * Only the ID of the objects associated to the first alias (column) is remembered.. in case we have to rebuild a filter
+	 * 
+	 * @param hash $aObjectArray
+	 */
 	protected function AddObjectExtended($aObjectArray)
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -1075,17 +907,15 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Add an array of objects into the current set
-     *
-     * Limitation:
-     * Sets with several classes per row are not supported (use AddObjectExtended instead)
-     *
-     * @param array $aObjects The array of objects to add
-     * @param string $sClassAlias The Alias of the class for the added objects
-     *
-     * @throws \MySQLException
-     */
+	/**
+	 * Add an array of objects into the current set
+	 * 
+	 * Limitation:
+	 * Sets with several classes per row are not supported (use AddObjectExtended instead)
+	 * 
+	 * @param array $aObjects The array of objects to add
+	 * @param string $sClassAlias The Alias of the class for the added objects
+	 */
 	public function AddObjectArray($aObjects, $sClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -1103,9 +933,8 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * Limitation:
 	 * The added objects are not checked for duplicates (i.e. one cann add several times the same object, or add an object already present in the set).
 	 * 
-	 * @param \DBObjectSet $oObjectSet The set to append
-     *
-	 * @throws \CoreException
+	 * @param DBObjectSet $oObjectSet The set to append
+	 * @throws CoreException
 	 */
 	public function Append(DBObjectSet $oObjectSet)
 	{
@@ -1122,24 +951,17 @@ class DBObjectSet implements iDBObjectSetIterator
 		}
 	}

-    /**
-     * Create a set containing the objects present in both the current set and another specified set
-     *
-     * Limitations:
-     * Will NOT work if only a subset of the sets was loaded with SetLimit.
-     * Works only with sets made of objects loaded from the database since the comparison is based on the objects identifiers
-     *
-     * @param \DBObjectSet $oObjectSet The set to intersect with. The current position inside the set will be lost (= at the end)
-     *
-     * @return \DBObjectSet A new set of objects, containing the objects present in both sets (based on their identifier)
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MissingQueryArgument
-     * @throws \MySQLException
-     * @throws \MySQLHasGoneAwayException
-     */
+	/**
+	 * Create a set containing the objects present in both the current set and another specified set
+	 * 
+	 * Limitations:
+	 * Will NOT work if only a subset of the sets was loaded with SetLimit.
+	 * Works only with sets made of objects loaded from the database since the comparison is based on the objects identifiers
+	 * 
+	 * @param DBObjectSet $oObjectSet The set to intersect with. The current position inside the set will be lost (= at the end)
+	 * @throws CoreException
+	 * @return DBObjectSet A new set of objects, containing the objects present in both sets (based on their identifier)
+	 */
 	public function CreateIntersect(DBObjectSet $oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
@@ -1171,19 +993,16 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oNewSet;
 	}

-    /**
-     * Compare two sets of objects to determine if their content is identical or not.
-     *
-     * Limitation:
-     * Works only for sets of 1 column (i.e. one class of object selected)
-     *
-     * @param \DBObjectSet $oObjectSet
-     * @param array $aExcludeColumns The list of columns to exclude frop the comparison
-     *
-     * @return boolean True if the sets are identical, false otherwise
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * Compare two sets of objects to determine if their content is identical or not.
+	 * 
+	 * Limitation:
+	 * Works only for sets of 1 column (i.e. one class of object selected)
+	 * 
+	 * @param DBObjectSet $oObjectSet
+	 * @param array $aExcludeColumns The list of columns to exclude frop the comparison
+	 * @return boolean True if the sets are identical, false otherwise
+	 */
 	public function HasSameContents(DBObjectSet $oObjectSet, $aExcludeColumns = array())
 	{	
 		$oComparator = new DBObjectSetComparator($this, $oObjectSet, $aExcludeColumns);
@@ -1197,12 +1016,10 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * The objects inside the set must be written in the database since the comparison is based on their identifiers
 	 * Sets with several objects per row are NOT supported
 	 * 
-	 * @param \DBObjectSet $oObjectSet
+	 * @param DBObjectSet $oObjectSet
+	 * @throws CoreException
 	 * 
-	 * @return \DBObjectSet The "delta" set.
-     *
-     * @throws \Exception
-     * @throws \CoreException
+	 * @return DBObjectSet The "delta" set.
 	 */
 	public function CreateDelta(DBObjectSet $oObjectSet)
 	{
@@ -1235,11 +1052,9 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oNewSet;
 	}

-    /**
-     * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
-     *
-     * @throws \Exception
-     */
+	/**
+	 * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
+	 */
 	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
 	{
 		$aRelatedObjs = array();
@@ -1263,21 +1078,16 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $aRelatedObjs;
 	}

-    /**
-     * Compute the "RelatedObjects" (forward or "down" direction) for the set
-     * for the specified relation
-     *
-     * @param string $sRelCode The code of the relation to use for the computation
-     * @param int $iMaxDepth Maximum recursion depth
-     * @param bool $bEnableRedundancy
-     *
-     * @return \RelationGraph The graph of all the related objects
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
+	/**
+	 * Compute the "RelatedObjects" (forward or "down" direction) for the set
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
 	public function GetRelatedObjectsDown($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
 	{
 		$oGraph = new RelationGraph();
@@ -1290,21 +1100,16 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oGraph;
 	}
 	
-    /**
-     * Compute the "RelatedObjects" (reverse or "up" direction) for the set
-     * for the specified relation
-     *
-     * @param string $sRelCode The code of the relation to use for the computation
-     * @param int $iMaxDepth Maximum recursion depth
-     * @param bool $bEnableRedundancy
-     *
-     * @return \RelationGraph The graph of all the related objects
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
+	/**
+	 * Compute the "RelatedObjects" (reverse or "up" direction) for the set
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
 	public function GetRelatedObjectsUp($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
 	{
 		$oGraph = new RelationGraph();
@@ -1317,20 +1122,13 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oGraph;
 	}
 	
-    /**
-     * Builds an object that contains the values that are common to all the objects
-     * in the set. If for a given attribute, objects in the set have various values
-     * then the resulting object will contain null for this value.
-     *
-     * @param array $aValues Hash Output: the distribution of the values, in the set, for each attribute
-     *
-     * @return \DBObject The object with the common values
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     * @throws \MySQLException
-     */
+	/**
+	 * Builds an object that contains the values that are common to all the objects
+	 * in the set. If for a given attribute, objects in the set have various values
+	 * then the resulting object will contain null for this value.
+	 * @param $aValues Hash Output: the distribution of the values, in the set, for each attribute
+	 * @return DBObject The object with the common values
+	 */
 	public function ComputeCommonObject(&$aValues)
 	{
 		$sClass = $this->GetClass();
@@ -1414,7 +1212,7 @@ class DBObjectSet implements iDBObjectSetIterator

 	/**
 	 * List the constant fields (and their value) in the given query
-	 * @return array [Alias][AttCode] => value
+	 * @return Hash [Alias][AttCode] => value
 	 */
 	public function ListConstantFields()
 	{
@@ -1505,11 +1303,9 @@ class DBObjectSetComparator
 		$this->oSet2 = $oSet2;		
 	}
 	
-    /**
-     * Builds the lists of fingerprints and initializes internal structures, if it was not already done
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * Builds the lists of fingerprints and initializes internal structures, if it was not already done
+	 */
 	protected function ComputeFingerprints()
 	{
 		if ($this->aFingerprints1 === null)
@@ -1555,12 +1351,10 @@ class DBObjectSetComparator
 		}
 	}
 	
-    /**
-     * Tells if the sets are equivalent or not. Returns as soon as the first difference is found.
-     * @return boolean true if the set have an equivalent content, false otherwise
-     *
-     * @throws \CoreException
-     */
+	/**
+	 * Tells if the sets are equivalent or not. Returns as soon as the first difference is found.
+	 * @return boolean true if the set have an equivalent content, false otherwise
+	 */
 	public function SetsAreEquivalent()
 	{
 		if (($this->oSet1 === null) && ($this->oSet2 === null))
@@ -1600,15 +1394,12 @@ class DBObjectSetComparator
 		return true;
 	}
 	
-    /**
-     * Get the list of differences between the two sets. In ordeer to write back into the database only the minimum changes
-     * THE FIRST SET MUST BE THE ONE LOADED FROM THE DATABASE
-     * Returns a hash: 'added' => DBObject(s), 'removed' => DBObject(s), 'modified' => DBObjects(s)
-     * @return array
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     */
+	/**
+	 * Get the list of differences between the two sets. In ordeer to write back into the database only the minimum changes
+	 * THE FIRST SET MUST BE THE ONE LOADED FROM THE DATABASE
+	 * Returns a hash: 'added' => DBObject(s), 'removed' => DBObject(s), 'modified' => DBObjects(s)
+	 * @return Ambigous <int:DBObject: , unknown>
+	 */
 	public function GetDifferences()
 	{
 		$aResult = array('added' => array(), 'removed' => array(), 'modified' => array());
@@ -1658,18 +1449,12 @@ class DBObjectSetComparator
 		return $aResult;
 	}
 	
-    /**
-     * Helpr to clone (in memory) an object and to apply to it the values taken from a second object
-     *
-     * @param \DBObject $oObjToClone
-     * @param \DBObject $oObjWithValues
-     *
-     * @return \DBObject The modified clone
-     *
-     * @throws \ArchivedObjectException
-     * @throws \CoreException
-     * @throws \CoreUnexpectedValue
-     */
+	/**
+	 * Helpr to clone (in memory) an object and to apply to it the values taken from a second object
+	 * @param DBObject $oObjToClone
+	 * @param DBObject $oObjWithValues
+	 * @return DBObject The modified clone
+	 */
 	protected function CopyFrom($oObjToClone, $oObjWithValues)
 	{
 		$oObj = MetaModel::GetObject(get_class($oObjToClone), $oObjToClone->GetKey());
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -239,92 +239,25 @@ abstract class DBSearch
 	/**
 	 * Turn the parameters (:xxx) into scalar values in order to easily
 	 * serialize a search
-	 *
-	 * @param array $aArgs
-	 *
-	 * @return string
 	 */
 	abstract public function ApplyParameters($aArgs);

-    public function serialize($bDevelopParams = false, $aContextParams = array())
+    public function serialize($bDevelopParams = false, $aContextParams = null)
 	{
-		$aQueryParams = $this->GetQueryParams();
-
-		$aContextParams = array_merge($this->GetInternalParams(), $aContextParams);
-
-		foreach($aQueryParams as $sParam => $sValue)
-		{
-			if (isset($aContextParams[$sParam]))
-			{
-				$aQueryParams[$sParam] = $aContextParams[$sParam];
-			}
-			elseif (($iPos = strpos($sParam, '->')) !== false)
-			{
-				$sParamName = substr($sParam, 0, $iPos);
-				if (isset($aContextParams[$sParamName.'->object()']))
-				{
-					$sAttCode = substr($sParam, $iPos + 2);
-					/** @var \DBObject $oObj */
-					$oObj = $aContextParams[$sParamName.'->object()'];
-					if ($oObj->IsModified())
-					{
-						if ($sAttCode == 'id')
-						{
-							$aQueryParams[$sParam] = $oObj->GetKey();
-						}
-						else
-						{
-							$aQueryParams[$sParam] = $oObj->Get($sAttCode);
-						}
-					}
-					else
-					{
-						unset($aQueryParams[$sParam]);
-						// For database objects, serialize only class, key
-						$aQueryParams[$sParamName.'->id'] = $oObj->GetKey();
-						$aQueryParams[$sParamName.'->class'] = get_class($oObj);
-					}
-				}
-			}
-		}
-
 		$sOql = $this->ToOql($bDevelopParams, $aContextParams);
-		return json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties));
+		return rawurlencode(base64_encode(serialize(array($sOql, $this->GetInternalParams(), $this->m_aModifierProperties))));
 	}

 	/**
 	 * @param string $sValue Serialized OQL query
 	 *
 	 * @return \DBSearch
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \OQLException
 	 */
 	static public function unserialize($sValue)
 	{
-		$aData = json_decode($sValue, true);
-		if (is_null($aData))
-		{
-			throw new CoreException("Invalid filter parameter");
-		}
+		$aData = unserialize(base64_decode(rawurldecode($sValue)));
 		$sOql = $aData[0];
 		$aParams = $aData[1];
-		$aExtraParams = array();
-		foreach($aParams as $sParam => $sValue)
-		{
-			if (($iPos = strpos($sParam, '->class')) !== false)
-			{
-				$sParamName = substr($sParam, 0, $iPos);
-				if (isset($aParams[$sParamName.'->id']))
-				{
-					$sClass = $aParams[$sParamName.'->class'];
-					$iKey = $aParams[$sParamName.'->id'];
-					$oObj = MetaModel::GetObject($sClass, $iKey);
-					$aExtraParams[$sParamName.'->object()'] = $oObj;
-				}
-			}
-		}
-		$aParams = array_merge($aExtraParams, $aParams);
 		// We've tried to use gzcompress/gzuncompress, but for some specific queries
 		// it was not working at all (See Trac #193)
 		// gzuncompress was issuing a warning "data error" and the return object was null
@@ -402,7 +335,6 @@ abstract class DBSearch
 			}
 		}

-		/** @var DBObjectSearch | null $oResultFilter */
 		if (!isset($oResultFilter))
 		{
 			$oKPI = new ExecutionKPI();
@@ -441,19 +373,10 @@ abstract class DBSearch
 		return $oResultFilter;
 	}

+	// Alternative to object mapping: the data are transfered directly into an array
+	// This is 10 times faster than creating a set of objects, and makes sense when optimization is required
 	/**
-	 * Alternative to object mapping: the data are transfered directly into an array
-	 * This is 10 times faster than creating a set of objects, and makes sense when optimization is required
-	 *
-	 * @param array $aColumns
-	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
-	 * @param array $aArgs
-	 *
-	 * @return array|void
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
 	 */	
 	public function ToDataArray($aColumns = array(), $aOrderBy = array(), $aArgs = array())
 	{
@@ -684,30 +607,11 @@ abstract class DBSearch
 		return $sRes;
 	}

-	protected abstract function IsDataFiltered();
-	protected abstract function SetDataFiltered();

 	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
-		$oSearch = $this;
-		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered())
-		{
-			$oVisibleObjects = UserRights::GetSelectFilter($this->GetClass(), $this->GetModifierProperties('UserRightsGetSelectFilter'));
-			if ($oVisibleObjects === false)
-			{
-				// Make sure this is a valid search object, saying NO for all
-				$oVisibleObjects = DBObjectSearch::FromEmptySet($this->GetClass());
-			}
-			if (is_object($oVisibleObjects))
-			{
-				$oVisibleObjects->AllowAllData();
-				$oSearch = $this->Intersect($oVisibleObjects);
-				/** @var DBSearch $oSearch */
-				$oSearch->SetDataFiltered();
-			}
-		}
-		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
-		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
+		$oSQLQuery = $this->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
+		$oSQLQuery->SetSourceOQL($this->ToOQL());

 		// Join to an additional table, if required...
 		//
@@ -731,20 +635,6 @@ abstract class DBSearch
 		$aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null
 	);

-	/**
-	 * @return \Expression
-	 */
-	public abstract function GetCriteria();
-
-	public abstract function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true);
-
-	/**
-	 * @return string a unique param name
-	 */
-	protected function GenerateUniqueParamName() {
-		return str_replace('.', '', 'param_'.microtime(true).rand(0,100));
-	}
-
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Cache/Trace/Log queries
--- a/core/dbunionsearch.class.php
+++ b/core/dbunionsearch.class.php
@@ -312,9 +312,9 @@ class DBUnionSearch extends DBSearch

 	/**
 	 * Specify a condition on external keys or link sets
-	 * @param String sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
 	 *                 Example: infra_list->ci_id->location_id->country	 
-	 * @param Object value The value to match (can be an array => IN(val1, val2...)
+	 * @param value The value to match (can be an array => IN(val1, val2...)
 	 * @return void
 	 */
 	public function AddConditionAdvanced($sAttSpec, $value)
@@ -598,54 +598,4 @@ class DBUnionSearch extends DBSearch
 		if (self::$m_bDebugQuery) $oSQLQuery->DisplayHtml();
 		return $oSQLQuery;
 	}
-
-	/**
-	 * @return \Expression
-	 */
-	public function GetCriteria()
-	{
-		// We're at the limit here
-		$oSearch = reset($this->aSearches);
-		return $oSearch->GetCriteria();
-	}
-
-	protected function IsDataFiltered()
-	{
-		$bIsAllDataFiltered = true;
-		foreach ($this->aSearches as $oSearch)
-		{
-			if (!$oSearch->IsDataFiltered())
-			{
-				$bIsAllDataFiltered = false;
-				break;
-			}
-		}
-		return $bIsAllDataFiltered;
-	}
-
-	protected function SetDataFiltered()
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->SetDataFiltered();
-		}
-	}
-
-	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
-	{
-		$sInParamName = $this->GenerateUniqueParamName();
-		foreach ($this->aSearches as $iSearchIndex => $oSearch)
-		{
-			$oFieldExpression = new FieldExpression($sFilterCode, $oSearch->GetClassAlias());
-
-			$sOperator = $bPositiveMatch ? 'IN' : 'NOT IN';
-
-			$oParamExpression = new VariableExpression($sInParamName);
-			$oSearch->GetInternalParamsByRef()[$sInParamName] = $aValues;
-
-			$oListExpression = new ListExpression(array($oParamExpression));
-			$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oListExpression);
-			$oSearch->AddConditionExpression($oInCondition);
-		}
-	}
 }
--- a/core/designdocument.class.inc.php
+++ b/core/designdocument.class.inc.php
@@ -1,23 +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/>
- *
- */
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>

 /**
 * Design document and associated nodes
@@ -60,9 +57,6 @@ class DesignDocument extends DOMDocument

 	/**
 	 * Overload of the standard API
-	 *
-	 * @param $filename
-	 * @param int $options
 	 */
 	public function load($filename, $options = 0)
 	{
@@ -71,11 +65,6 @@ class DesignDocument extends DOMDocument

 	/**
 	 * Overload of the standard API
-	 *
-	 * @param $filename
-	 * @param int $options
-	 *
-	 * @return int
 	 */
 	public function save($filename, $options = 0)
 	{
@@ -95,18 +84,18 @@ class DesignDocument extends DOMDocument
 		{
 			return $sXml;
 		}
-
-		echo "<pre>\n";
-		echo htmlentities($sXml);
-		echo "</pre>\n";
-
-		return '';
+		else
+		{
+			echo "<pre>\n";
+			echo htmlentities($sXml);
+			echo "</pre>\n";
+		}
 	}

 	/**
 	 * Quote and escape strings for use within an XPath expression
 	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
-	 * @param string $sValue The value to be quoted
+	 * @param $sValue The value to be quoted
 	 * @return string to be used within an XPath
 	 */
 	public static function XPathQuote($sValue)
@@ -126,7 +115,7 @@ class DesignDocument extends DOMDocument
 	/**
 	 * Extracts some nodes from the DOM
 	 * @param string $sXPath A XPath expression
-	 * @param DesignElement $oContextNode The node to start the search from
+	 * @param DesignNode|null $oContextNode The node to start the search from
 	 * @return \DOMNodeList
 	 */
 	public function GetNodes($sXPath, $oContextNode = null)
@@ -145,7 +134,7 @@ class DesignDocument extends DOMDocument

 	/**
 	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
-	 * @param DesignElement $oNode The node to describe
+	 * @param $oNode The node to describe
 	 * @return string
 	 */
 	public static function GetItopNodePath($oNode)
@@ -177,11 +166,8 @@ class DesignElement extends \DOMElement

 	/**
 	 * Create an HTML representation of the DOM, for debugging purposes
-	 *
 	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
-	 *
 	 * @return mixed void or the HTML representation of the DOM
-	 * @throws \Exception
 	 */
 	public function Dump($bReturnRes = false)
 	{
@@ -194,16 +180,19 @@ class DesignElement extends \DOMElement
 		{
 			return $sXml;
 		}
-		echo "<pre>\n";
-		echo htmlentities($sXml);
-		echo "</pre>\n";
-		return '';
+		else
+		{
+			echo "<pre>\n";
+			echo htmlentities($sXml);
+			echo "</pre>\n";
+		}
 	}
+
 	/**
 	 * Returns the node directly under the given node
 	 * @param $sTagName
 	 * @param bool|true $bMustExist
-	 * @return \MFElement
+	 * @return MFElement
 	 * @throws DOMFormatException
 	 */
 	public function GetUniqueElement($sTagName, $bMustExist = true)
@@ -227,7 +216,7 @@ class DesignElement extends \DOMElement
 	/**
 	 * Returns the node directly under the current node, or null if missing
 	 * @param $sTagName
-	 * @return \MFElement
+	 * @return MFElement
 	 * @throws DOMFormatException
 	 */
 	public function GetOptionalElement($sTagName)
@@ -263,12 +252,9 @@ class DesignElement extends \DOMElement

 	/**
 	 * Get the TEXT value from a child node
-	 *
 	 * @param string $sTagName
 	 * @param string|null $sDefault
-	 *
 	 * @return string
-	 * @throws \DOMFormatException
 	 */
 	public function GetChildText($sTagName, $sDefault = null)
 	{
--- a/core/dict.class.inc.php
+++ b/core/dict.class.inc.php
@@ -116,22 +116,6 @@ class Dict
 		self::$m_iErrorMode = $iErrorMode;
 	}

-	/**
-	 * Check if a dictionary entry exists or not
-	 * @param $sStringCode
-	 *
-	 * @return bool
-	 */
-	public static function Exists($sStringCode)
-	{
-		$sImpossibleString = 'aVlHYKEI3TZuDV5o0pghv7fvhYNYuzYkTk7WL0Zoqw8rggE7aq';
-		if (static::S($sStringCode, $sImpossibleString) === $sImpossibleString)
-		{
-			return false;
-		}
-		return true;
-	}
-
 	/**
 	 * Returns a localised string from the dictonary
 	 *
@@ -213,7 +197,7 @@ class Dict
 	/**
 	 * Initialize a the entries for a given language (replaces the former Add() method)
 	 * @param string $sLanguageCode Code identifying the language i.e. 'FR-FR', 'EN-US'
-	 * @param array $aEntries Hash array of dictionnary entries
+	 * @param hash $aEntries Hash array of dictionnary entries
 	 */
 	public static function SetEntries($sLanguageCode, $aEntries)
 	{
--- a/core/displayablegraph.class.inc.php
+++ b/core/displayablegraph.class.inc.php
@@ -1438,22 +1438,22 @@ class DisplayableGraph extends SimpleGraph
 			}
 			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
 		}
-		$sSftShort = Dict::S('UI:ElementsDisplayed');
-		$sSearchToggle = Dict::S('UI:Search:Toggle');
 		$oP->add("<div class=\"not-printable\">\n");
-		$oP->add(
+		$oP->add("<div id=\"ds_flash\" class=\"search_box\" style=\"display:none;\">\n");
+		if (!$oP->IsPrintableVersion())
+		{
+			$oP->add_ready_script(
 <<<EOF
- <div id="ds_flash" class="search_box">
-	<form id="dh_flash" class="search_form_handler closed">
-	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fa fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
-	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
+	$( "#tabbedContent_0" ).tabs({ heightStyle: "fill" });
 EOF
-		);
+			);
+		}
 		
 		$oP->add_ready_script(
 <<<EOF
-	$("#dh_flash > .sf_title").click( function() {
-		$("#dh_flash").toggleClass('closed');
+	$("#dh_flash").click( function() {
+		$("#ds_flash").slideToggle('normal', function() { $("#ds_flash").parent().resize(); $("#dh_flash").trigger('toggle_complete'); } );
+		$("#dh_flash").toggleClass('open');
 	});
    $('#ReloadMovieBtn').button().button('disable');
 EOF
@@ -1476,8 +1476,9 @@ EOF
 			$idx++;
 		}
 		$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></p>");
-		$oP->add("</div></div></form>");
 		$oP->add("</div>\n");
+		$oP->add("<div class=\"HRDrawer\"></div>\n");
+		$oP->add("<div id=\"dh_flash\" class=\"DrawerHandle\">".Dict::S('UI:ElementsDisplayed')."</div>\n");
 	 	$oP->add("</div>\n"); // class="not-printable"

 		$aAdditionalContexts = array();
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -57,7 +57,6 @@ class EMail
 	{
 		$this->m_aData = array();
 		$this->m_oMessage = Swift_Message::newInstance();
-		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
 	}

 	/**
@@ -236,26 +235,17 @@ class EMail
 			@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$this->m_aData['body']['body']); // For loading HTML chunks where the character set is not specified
 			
 			$oXPath = new DOMXPath($oDOMDoc);
-			$sXPath = '//img[@'.InlineImage::DOM_ATTR_ID.']';
+			$sXPath = "//img[@data-img-id]";
 			$oImagesList = $oXPath->query($sXPath);
 			
 			if ($oImagesList->length != 0)
 			{
 				foreach($oImagesList as $oImg)
 				{
-					$iAttId = $oImg->getAttribute(InlineImage::DOM_ATTR_ID);
+					$iAttId = $oImg->getAttribute('data-img-id');
 					$oAttachment = MetaModel::GetObject('InlineImage', $iAttId, false, true /* Allow All Data */);
 					if ($oAttachment)
 					{
-						$sImageSecret = $oImg->getAttribute('data-img-secret');
-						$sAttachmentSecret = $oAttachment->Get('secret');
-						if ($sImageSecret !== $sAttachmentSecret)
-						{
-							// @see N°1921
-							// If copying from another iTop we could get an IMG pointing to an InlineImage with wrong secret
-							continue;
-						}
-
 						$oDoc = $oAttachment->Get('contents');
 						$oSwiftImage = new Swift_Image($oDoc->GetData(), $oDoc->GetFileName(), $oDoc->GetMimeType());
 						$sCid = $this->m_oMessage->embed($oSwiftImage);
@@ -270,11 +260,6 @@ class EMail

 	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
 	{
-		//select a default sender if none is provided.
-		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
-			$this->SetRecipientFrom($this->m_aData['to']);
-		}
-
 		if ($bForceSynchronous)
 		{
 			return $this->SendSynchronous($aIssues, $oLog);
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -188,16 +188,11 @@ EOF
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 				$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
 			}
-            else if ($value instanceOf ormDocument)
-            {
-                $oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-                $sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
-            }
-            else if ($value instanceOf ormTagSet)
-            {
-                $oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-                $sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
-            }
+			else if ($value instanceOf ormDocument)
+			{
+				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
+				$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
+			}
 			else
 			{
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
--- a/core/htmlsanitizer.class.inc.php
+++ b/core/htmlsanitizer.class.inc.php
@@ -154,7 +154,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer

 	/**
 	 * @var array
-	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
 	 */
 	protected static $aTagsWhiteList = array(
 		'html' => array(),
@@ -184,9 +184,9 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'table' => array('style', 'width', 'summary', 'align', 'border', 'cellpadding', 'cellspacing'),
 		'thead' => array('style'),
 		'tbody' => array('style'),
-		'tr' => array('style', 'colspan', 'rowspan'),
-		'td' => array('style', 'colspan', 'rowspan'),
-		'th' => array('style', 'colspan', 'rowspan'),
+		'tr' => array('style'),
+		'td' => array('style', 'colspan'),
+		'th' => array('style'),
 		'fieldset' => array('style'),
 		'legend' => array('style'),
 		'font' => array('face', 'color', 'style', 'size'),
@@ -211,7 +211,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer

 	/**
 	 * @var array
-	 * @see https://www.itophub.io/wiki/page?id=2_6_0%3Aadmin%3Arich_text_limitations
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
 	 */
 	protected static $aStylesWhiteList = array(
 		'background-color',
@@ -230,9 +230,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'margin',
 		'padding',
 		'text-align',
-		'vertical-align',
 		'width',
-		'white-space',
 	);

 	public function __construct()
@@ -348,7 +346,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 					$this->CleanNode($oNode);
 					if (($oNode instanceof DOMElement) && (strtolower($oNode->tagName) == 'img'))
 					{
-						InlineImage::ProcessImageTag($oNode);
+						$this->ProcessImage($oNode);
 					}
 				}
 			}
@@ -360,6 +358,23 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		}
 	}
 	
+	/**
+	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
+	 * so that we can later reconstruct the full "src" URL when needed
+	 * @param DOMNode $oElement
+	 */
+	protected function ProcessImage(DOMNode $oElement)
+	{
+		$sSrc = $oElement->getAttribute('src');
+		$sDownloadUrl = str_replace(array('.', '?'), array('\.', '\?'), INLINEIMAGE_DOWNLOAD_URL); // Escape . and ?
+		$sUrlPattern = '|'.$sDownloadUrl.'([0-9]+)&s=([0-9a-f]+)|';
+		if (preg_match($sUrlPattern, $sSrc, $aMatches))
+		{
+			$oElement->setAttribute('data-img-id', $aMatches[1]);
+			$oElement->setAttribute('data-img-secret', $aMatches[2]);
+		}
+	}
+	
 	protected function CleanStyle($sStyle)
 	{
 		$aAllowedStyles = array();
--- a/core/inlineimage.class.inc.php
+++ b/core/inlineimage.class.inc.php
@@ -27,11 +27,6 @@ define('INLINEIMAGE_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_i

 class InlineImage extends DBObject
 {
-	/** @var string attribute to be added to IMG tags to contain ID */
-	const DOM_ATTR_ID = 'data-img-id';
-	/** @var string attribute to be added to IMG tags to contain secret */
-	const DOM_ATTR_SECRET = 'data-img-secret';
-
 	public static function Init()
 	{
 		$aParams = array
@@ -166,7 +161,7 @@ class InlineImage extends DBObject
 	 */
 	public static function FinalizeInlineImages(DBObject $oObject)
 	{
-		$iTransactionId = utils::ReadParam('transaction_id', null, false, 'transaction_id');
+		$iTransactionId = utils::ReadParam('transaction_id', null);
 		if (!is_null($iTransactionId))
 		{
 			// Attach new (temporary) inline images
@@ -183,19 +178,6 @@ class InlineImage extends DBObject
 				$oInlineImage->DBUpdate();
 			}
 		}
-// For tracing issues with Inline Images... but beware not all updates are interactive, so this trace happens when creating objects non-interactively (REST, Synchro...)
-// 		else
-//		{
-//			IssueLog::Error('InlineImage: Error during FinalizeInlineImages(), no transaction ID for object '.get_class($oObject).'#'.$oObject->GetKey().'.');
-//
-//			IssueLog::Error('|- Call stack:');
-//			$oException = new Exception();
-//			$sStackTrace = $oException->getTraceAsString();
-//			IssueLog::Error($sStackTrace);
-//
-//			IssueLog::Error('|- POST vars:');
-//			IssueLog::Error(print_r($_POST, true));
-//		}
 	}
 	
 	/**
@@ -226,8 +208,7 @@ class InlineImage extends DBObject
 		$aNeedles = array();
 		$aReplacements = array();
 		// Find img tags with an attribute data-img-id
-		if (preg_match_all('/<img ([^>]*)'.self::DOM_ATTR_ID.'="([0-9]+)"([^>]*)>/i',
-			$sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if (preg_match_all('/<img ([^>]*)data-img-id="([0-9]+)"([^>]*)>/i', $sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
 			$sUrl = utils::GetAbsoluteUrlAppRoot().INLINEIMAGE_DOWNLOAD_URL;
 			foreach($aMatches as $aImgInfo)
@@ -249,42 +230,6 @@ class InlineImage extends DBObject
 		return $sHtml;
 	}

-	/**
-	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
-	 * so that we can later reconstruct the full "src" URL when needed
-	 *
-	 * @param \DOMElement $oElement
-	 */
-	public static function ProcessImageTag(DOMElement $oElement)
-	{
-		$sSrc = $oElement->getAttribute('src');
-		$sDownloadUrl = str_replace(array('.', '?'), array('\.', '\?'), INLINEIMAGE_DOWNLOAD_URL); // Escape . and ?
-		$sUrlPattern = '|'.$sDownloadUrl.'([0-9]+)&s=([0-9a-f]+)|';
-		$bIsInlineImage = preg_match($sUrlPattern, $sSrc, $aMatches);
-		if (!$bIsInlineImage)
-		{
-			return;
-		}
-		$iInlineImageId = $aMatches[1];
-		$sInlineIMageSecret = $aMatches[2];
-
-		$sAppRoot = utils::GetAbsoluteUrlAppRoot();
-		$sAppRootPattern = '/^'.preg_quote($sAppRoot, '/').'/';
-		$bIsSameItop = preg_match($sAppRootPattern, $sSrc);
-		if (!$bIsSameItop)
-		{
-			// @see N°1921
-			// image from another iTop should be treated as external images
-			$oElement->removeAttribute(self::DOM_ATTR_ID);
-			$oElement->removeAttribute(self::DOM_ATTR_SECRET);
-
-			return;
-		}
-
-		$oElement->setAttribute(self::DOM_ATTR_ID, $iInlineImageId);
-		$oElement->setAttribute(self::DOM_ATTR_SECRET, $sInlineIMageSecret);
-	}
-
 	/**
 	 * Get the javascript fragment  - to be added to "on document ready" - to adjust (on the fly) the width on Inline Images
 	 */
@@ -312,12 +257,8 @@ EOF
 	
 	/**
 	 * Check if an the given mimeType is an image that can be processed by the system
-	 *
 	 * @param string $sMimeType
-	 *
-	 * @return boolean always false if php-gd not installed
-	 *                 otherwise true if file is one of those type : image/gif, image/jpeg, image/png
-	 * @uses php-gd extension
+	 * @return boolean
 	 */
 	public static function IsImage($sMimeType)
 	{
@@ -463,11 +404,9 @@ EOF
 	 * Get the fragment of javascript needed to complete the initialization of
 	 * CKEditor when creating/modifying an object
 	 *
-	 * @param \DBObject $oObject The object being edited
-	 * @param string $sTempId Generated through utils::GetUploadTempId($iTransactionId)
-	 *
+	 * @param DBObject $oObject The object being edited
+	 * @param string $sTempId The concatenation of session_id().'_'.$iTransactionId.
 	 * @return string The JS fragment to insert in "on document ready"
-	 * @throws \Exception
 	 */
 	public static function EnableCKEditorImageUpload(DBObject $oObject, $sTempId)
 	{
@@ -558,69 +497,51 @@ EOF
 */
 class InlineImageGC implements iBackgroundProcess
 {
-    public function GetPeriodicity()
-    {
-        return 1; // Runs every 8 hours
-    }
+	public function GetPeriodicity()
+	{
+		return MetaModel::GetConfig()->Get('inline_image_garbage_collector_interval'); // run every definied time
+	}

-	/**
-	 * @param int $iTimeLimit
-	 *
-	 * @return string
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DeleteException
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
 	public function Process($iTimeLimit)
 	{
 		$sDateLimit = date(AttributeDateTime::GetSQLFormat(), time()); // Every temporary InlineImage/Attachment expired will be deleted

-		$aResults = array();
-		$aClasses = array('InlineImage', 'Attachment');
-		foreach($aClasses as $sClass)
-		{
-			$iProcessed = 0;
-			if(class_exists($sClass))
-			{
-				$iProcessed = $this->DeleteExpiredDocuments($sClass, $iTimeLimit, $sDateLimit);
-			}
-			$aResults[] = "$iProcessed old temporary $sClass(s)";
-		}
-
-		return "Cleaned ".implode(' and ', $aResults).".";
-	}
-
-	/**
-	 * @param string $sClass
-	 * @param int $iTimeLimit
-	 * @param string $sDateLimit
-	 *
-	 * @return int
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DeleteException
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	protected function DeleteExpiredDocuments($sClass, $iTimeLimit, $sDateLimit)
-	{
 		$iProcessed = 0;
-		$sOQL = "SELECT $sClass WHERE (item_id = 0) AND (expire < '$sDateLimit')";
-		// Next one ?
-		$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('expire' => true) /* order by*/, array(), null,
-			1 /* limit count */);
-		$oSet->OptimizeColumnLoad(array());
-		while ((time() < $iTimeLimit) && ($oResult = $oSet->Fetch()))
+		$sOQL = "SELECT InlineImage WHERE (item_id = 0) AND (expire < '$sDateLimit')";
+		while (time() < $iTimeLimit)
 		{
-			/** @var \ormDocument $oDocument */
-			$oDocument = $oResult->Get('contents');
-			IssueLog::Info($sClass.' GC: Removed temp. file '.$oDocument->GetFileName().' on "'.$oResult->Get('item_class').'" #'.$oResult->Get('item_id').' as it has expired.');
-			$oResult->DBDelete();
+			// Next one ?
+			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('expire' => true) /* order by*/, array(), null, 1 /* limit count */);
+			$oSet->OptimizeColumnLoad(array());
+			$oResult = $oSet->Fetch();
+			if (is_null($oResult))
+			{
+				// Nothing to be done
+				break;
+			}
 			$iProcessed++;
+			$oResult->DBDelete();
 		}
 		
-		return $iProcessed;
-}
+		$iProcessed2 = 0;
+		if (class_exists('Attachment'))
+		{
+			$sOQL = "SELECT Attachment WHERE (item_id = 0) AND (expire < '$sDateLimit')";
+			while (time() < $iTimeLimit)
+			{
+				// Next one ?
+				$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('expire' => true) /* order by*/, array(), null, 1 /* limit count */);
+				$oSet->OptimizeColumnLoad(array());
+				$oResult = $oSet->Fetch();
+				if (is_null($oResult))
+				{
+					// Nothing to be done
+					break;
+				}
+				$iProcessed2++;
+				$oResult->DBDelete();
+			}		
+		}
+		return "Cleaned $iProcessed old temporary InlineImage(s) and $iProcessed2 old temporary Attachment(s).";
+	}
 }
--- a/core/kpi.class.inc.php
+++ b/core/kpi.class.inc.php
@@ -107,7 +107,7 @@ class ExecutionKPI
 		self::Report("<div style=\"background-color: grey; padding: 10px;\">");
 		self::Report("<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>");
 		self::Report("<p>".date('Y-m-d H:i:s', $fItopStarted)."</p>");
-		self::Report("<p>log_kpi_user_id: ".UserRights::GetUserId()."</p>");
+		self::Report("<p>log_kpi_user_id: ".MetaModel::GetConfig()->Get('log_kpi_user_id')."</p>");
 		self::Report("<div>");
 		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
 		self::Report("<thead>");
@@ -116,14 +116,13 @@ class ExecutionKPI
 		foreach (self::$m_aExecData as $aOpStats)
 		{
 			$sOperation = $aOpStats['op'];
+			$sBegin = $sEnd = $sDuration = $sMemBegin = $sMemEnd = $sMemPeak = '?';
+		
 			$sBegin = round($aOpStats['time_begin'], 3);
 			$sEnd = round($aOpStats['time_end'], 3);
 			$fDuration = $aOpStats['time_end'] - $aOpStats['time_begin'];
 			$sDuration = round($fDuration, 3);

-			$sMemBegin = 'n/a';
-			$sMemEnd = 'n/a';
-			$sMemPeak = 'n/a';
 			if (isset($aOpStats['mem_begin']))
 			{
 				$sMemBegin = self::MemStr($aOpStats['mem_begin']);
@@ -198,13 +197,12 @@ class ExecutionKPI

 		self::Report("</div>");

-		self::Report("<p><a href=\"#end-".md5($sExecId)."\">Next page stats</a></p>");
-
 		// Report operation details
 		foreach (self::$m_aStats as $sOperation => $aOpStats)
 		{
 			$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
 			self::Report("<h4>$sOperationHtml</h4>");
+			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
 			self::Report("<table border=\"1\" style=\"$sTableStyle\">");
 			self::Report("<thead>");
 			self::Report("   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>");
@@ -253,9 +251,7 @@ class ExecutionKPI
 				self::Report("</tr>");
 			}
 			self::Report("</table>");
-			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
 		}
-		self::Report('<a name="end-'.md5($sExecId).'">&nbsp;</a>');
 	}


--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -144,7 +144,7 @@ abstract class MetaModel
 		// $aBacktrace[1] is the info we want
 		if (!empty($sExpectedFunctionName))
 		{
-			assert($aBacktrace[2]['function'] == $sExpectedFunctionName);
+			assert('$aBacktrace[2]["function"] == $sExpectedFunctionName');
 		}
 		if ($bRecordSourceFile)
 		{
@@ -320,7 +320,8 @@ abstract class MetaModel
 	final static public function GetName($sClass)
 	{
 		self::_check_subclass($sClass);
-		return $sClass::GetClassName($sClass);
+		$sStringCode = 'Class:'.$sClass;
+		return Dict::S($sStringCode, str_replace('_', ' ', $sClass));
 	}

 	/**
@@ -410,7 +411,8 @@ abstract class MetaModel
 	final static public function GetClassDescription($sClass)
 	{
 		self::_check_subclass($sClass);
-		return $sClass::GetClassDescription($sClass);
+		$sStringCode = 'Class:'.$sClass.'+';
+		return Dict::S($sStringCode, '');
 	}

 	/**
@@ -526,104 +528,6 @@ abstract class MetaModel
 		return $oRet;
 	}

-	/**
-	 * @param string $sClass
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 *
-	 * @since 2.6 N°659 uniqueness constraint
-	 */
-	final public static function GetUniquenessRules($sClass)
-	{
-		if (!isset(self::$m_aClassParams[$sClass]))
-		{
-			return array();
-		}
-
-		$aCurrentUniquenessRules = array();
-
-		if (array_key_exists('uniqueness_rules', self::$m_aClassParams[$sClass]))
-		{
-			$aCurrentUniquenessRules = self::$m_aClassParams[$sClass]['uniqueness_rules'];
-		}
-
-		$sParentClass = self::GetParentClass($sClass);
-		if ($sParentClass)
-		{
-			$aParentUniquenessRules = self::GetUniquenessRules($sParentClass);
-			foreach ($aParentUniquenessRules as $sUniquenessRuleId => $aParentUniquenessRuleProperties)
-			{
-				$bCopyDisabledKey = true;
-				$bCurrentDisabledValue = null;
-
-				if (array_key_exists($sUniquenessRuleId, $aCurrentUniquenessRules))
-				{
-					if (self::IsUniquenessRuleContainingOnlyDisabledKey($aCurrentUniquenessRules[$sUniquenessRuleId]))
-					{
-						$bCopyDisabledKey = false;
-					}
-					else
-					{
-						continue;
-					}
-				}
-
-				$aMergedUniquenessProperties = $aParentUniquenessRuleProperties;
-				if (!$bCopyDisabledKey)
-				{
-					$aMergedUniquenessProperties['disabled'] = $aCurrentUniquenessRules[$sUniquenessRuleId]['disabled'];
-				}
-				$aCurrentUniquenessRules[$sUniquenessRuleId] = $aMergedUniquenessProperties;
-			}
-		}
-
-		return $aCurrentUniquenessRules;
-	}
-
-	/**
-	 * @param string $sRuleId
-	 * @param string $sLeafClassName
-	 *
-	 * @return string name of the class, null if not present
-	 */
-	final public static function GetRootClassForUniquenessRule($sRuleId, $sLeafClassName)
-	{
-		$sFirstClassWithRuleId = null;
-		if (isset(self::$m_aClassParams[$sLeafClassName]['uniqueness_rules'][$sRuleId]))
-		{
-			$sFirstClassWithRuleId = $sLeafClassName;
-		}
-
-		$sParentClass = self::GetParentClass($sLeafClassName);
-		if ($sParentClass)
-		{
-			$sParentClassWithRuleId = self::GetRootClassForUniquenessRule($sRuleId, $sParentClass);
-			if (!is_null($sParentClassWithRuleId))
-			{
-				$sFirstClassWithRuleId = $sParentClassWithRuleId;
-			}
-		}
-
-		return $sFirstClassWithRuleId;
-	}
-
-	/**
-	 * @param array $aRuleProperties
-	 *
-	 * @return bool
-	 * @since 2.6 N°659 uniqueness constraint
-	 */
-	private static function IsUniquenessRuleContainingOnlyDisabledKey($aRuleProperties)
-	{
-		$aNonNullRuleProperties = array_filter($aRuleProperties, function ($v) {
-			return (!is_null($v));
-		});
-
-		return ((count($aNonNullRuleProperties) == 1) && (array_key_exists('disabled', $aNonNullRuleProperties)));
-	}
-
-
 	/**
 	 * @param string $sClass
 	 *
@@ -734,20 +638,6 @@ abstract class MetaModel
 		return reset($aAttributes);
 	}

-	/**
-	 * Returns the list of attributes composing the friendlyname
-	 *
-	 * @param $sClass
-	 *
-	 * @return array
-	 */
-	final static public function GetFriendlyNameAttributeCodeList($sClass)
-	{
-		$aNameSpec = self::GetNameSpec($sClass);
-		$aAttributes = $aNameSpec[1];
-		return $aAttributes;
-	}
-
 	/**
 	 * @param string $sClass
 	 *
@@ -1120,7 +1010,7 @@ abstract class MetaModel
 	/**
 	 * array of ("classname" => array of attributes)
 	 *
-	 * @var \AttributeDefinition[]
+	 * @var array
 	 */
 	private static $m_aAttribDefs = array();
 	/**
@@ -2695,7 +2585,7 @@ abstract class MetaModel

 		// Build the list of available extensions
 		//
-		$aInterfaces = array('iApplicationUIExtension', 'iApplicationObjectExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
+		$aInterfaces = array('iApplicationUIExtension', 'iApplicationObjectExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension');
 		foreach($aInterfaces as $sInterface)
 		{
 			self::$m_aExtensionClasses[$sInterface] = array();
@@ -2778,25 +2668,6 @@ abstract class MetaModel
 							$oClassInit->OnAfterClassInitialization($sPHPClass);
 						}
 					}
-
-					$aCurrentClassUniquenessRules = MetaModel::GetUniquenessRules($sPHPClass);
-					if (!empty($aCurrentClassUniquenessRules))
-					{
-						$aClassFields = self::GetAttributesList($sPHPClass);
-						foreach ($aCurrentClassUniquenessRules as $sUniquenessRuleId => $aUniquenessRuleProperties)
-						{
-							$bHasSameRuleInParent = self::HasSameUniquenessRuleInParent($sPHPClass, $sUniquenessRuleId);
-							try
-							{
-								self::CheckUniquenessRuleValidity($aUniquenessRuleProperties, $bHasSameRuleInParent, $aClassFields);
-							}
-							catch (CoreUnexpectedValue $e)
-							{
-								throw new Exception("Invalid uniqueness rule declaration : class={$sPHPClass}, rule=$sUniquenessRuleId, reason={$e->getMessage()}");
-							}
-						}
-					}
-
 				}
 				catch (ReflectionException $e)
 				{
@@ -3065,101 +2936,6 @@ abstract class MetaModel
 		}
 	}

-	/**
-	 * @param string $sClassName
-	 * @param string $sUniquenessRuleId
-	 *
-	 * @return bool true if one of the parent class (recursive) has the same rule defined
-	 * @throws \CoreException
-	 */
-	private static function HasSameUniquenessRuleInParent($sClassName, $sUniquenessRuleId)
-	{
-		$sParentClass = self::GetParentClass($sClassName);
-		if (empty($sParentClass))
-		{
-			return false;
-		}
-
-		$aParentClassUniquenessRules = self::GetUniquenessRules($sParentClass);
-		if (array_key_exists($sUniquenessRuleId, $aParentClassUniquenessRules))
-		{
-			return true;
-		}
-
-		return self::HasSameUniquenessRuleInParent($sParentClass, $sUniquenessRuleId);
-	}
-
-	/**
-	 * @param array $aUniquenessRuleProperties
-	 * @param bool $bRuleOverride if false then control an original declaration validity,
-	 *                   otherwise an override validity (can have only the disabled key)
-	 * @param string[] $aExistingClassFields if non empty, will check that all fields declared in the rules exists in the class
-	 *
-	 * @throws \CoreUnexpectedValue if the rule is invalid
-	 *
-	 * @since 2.6 N°659 uniqueness constraint
-	 */
-	public static function CheckUniquenessRuleValidity($aUniquenessRuleProperties, $bRuleOverride = true, $aExistingClassFields = array())
-	{
-		$MANDATORY_ATTRIBUTES = array('attributes');
-		$UNIQUENESS_MANDATORY_KEYS_NB = count($MANDATORY_ATTRIBUTES);
-		$bHasDisabledKey = false;
-		$bHasMissingMandatoryKey = true;
-		$iMissingMandatoryKeysNb = $UNIQUENESS_MANDATORY_KEYS_NB;
-		$bHasAllMandatoryKeysMissing = false;
-		$bHasNonDisabledKeys = false;
-
-		foreach ($aUniquenessRuleProperties as $sUniquenessRuleKey => $aUniquenessRuleProperty)
-		{
-			if (($sUniquenessRuleKey === 'disabled') && (!is_null($aUniquenessRuleProperty)))
-			{
-				$bHasDisabledKey = true;
-				continue;
-			}
-			$bHasNonDisabledKeys = true;
-
-			if (in_array($sUniquenessRuleKey, $MANDATORY_ATTRIBUTES, true)) {
-				$bHasMissingMandatoryKey = false;
-				$iMissingMandatoryKeysNb--;
-			}
-
-			if (($sUniquenessRuleKey === 'attributes') && (!empty($aExistingClassFields)))
-			{
-				foreach ($aUniquenessRuleProperties[$sUniquenessRuleKey] as $sRuleAttribute)
-				{
-					if (!in_array($sRuleAttribute, $aExistingClassFields, true))
-					{
-						throw new CoreUnexpectedValue("Uniqueness rule : non existing field '$sRuleAttribute'");
-					}
-				}
-			}
-		}
-
-		if ($iMissingMandatoryKeysNb == $UNIQUENESS_MANDATORY_KEYS_NB)
-		{
-			$bHasAllMandatoryKeysMissing = true;
-		}
-
-		if ($bHasDisabledKey)
-		{
-			if ($bRuleOverride && $bHasAllMandatoryKeysMissing && !$bHasNonDisabledKeys)
-			{
-				return;
-			}
-			if ($bHasMissingMandatoryKey)
-			{
-				throw new CoreUnexpectedValue('Uniqueness rule : missing mandatory properties');
-			}
-
-			return;
-		}
-
-		if ($bHasMissingMandatoryKey)
-		{
-			throw new CoreUnexpectedValue('Uniqueness rule : missing mandatory properties');
-		}
-	}
-
 	/**
 	 * To be overriden, must be called for any object class (optimization)
 	 */
@@ -4715,7 +4491,7 @@ abstract class MetaModel
 				}
 			}

-			// Check SQL columns uniqueness
+			// Check unicity of the SQL columns
 			//
 			if (self::HasTable($sClass))
 			{
@@ -5181,7 +4957,6 @@ abstract class MetaModel
 		$aCreateTableItems = array(); // array of <table> => array of <create definition>
 		$aAlterTableMetaData = array();
 		$aAlterTableItems = array(); // array of <table> => <alter specification>
-		$aPostTableAlteration = array(); // array of <table> => post alteration queries

 		foreach(self::GetClasses() as $sClass)
 		{
@@ -5259,7 +5034,6 @@ abstract class MetaModel
 			// Check that any defined field exists
 			//
 			$aTableInfo['Fields'][$sKeyField]['used'] = true;
-			$aFriendlynameAttcodes = self::GetFriendlyNameAttributeCodeList($sClass);
 			foreach(self::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
 				if (!$oAttDef->CopyOnAllTables())
@@ -5276,22 +5050,6 @@ abstract class MetaModel
 					$aTableInfo['Fields'][$sField]['used'] = true;

 					$bIndexNeeded = $oAttDef->RequiresIndex();
-					$bFullTextIndexNeeded = false;
-					if (!$bIndexNeeded)
-					{
-						// Add an index on the columns of the friendlyname
-						if (in_array($sField, $aFriendlynameAttcodes))
-						{
-							$bIndexNeeded = true;
-						}
-					}
-					else
-					{
-						if ($oAttDef->RequiresFullTextIndex())
-						{
-							$bFullTextIndexNeeded = true;
-						}
-					}

 					$sFieldDefinition = "`$sField` $sDBFieldSpec";
 					if (!CMDBSource::IsField($sTable, $sField))
@@ -5311,37 +5069,21 @@ abstract class MetaModel
 						if ($bIndexNeeded)
 						{
 							$aTableInfo['Indexes'][$sField]['used'] = true;
-							$sIndexName = $sField;
+							$aColumns = array($sField);
+							$aLength = self::DBGetIndexesLength($sClass, $aColumns, $aTableInfo);
 							$sColumns = '`'.$sField.'`';
-
-							if ($bFullTextIndexNeeded)
+							if (!is_null($aLength[0]))
 							{
-								$sIndexType = 'FULLTEXT INDEX';
+								$sColumns .= ' ('.$aLength[0].')';
+							}
+							$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` ADD INDEX `$sField` ($sColumns)";
+							if ($bTableToCreate)
+							{
+								$aCreateTableItems[$sTable][] = "INDEX `$sField` ($sColumns)";
 							}
 							else
 							{
-								$sIndexType = 'INDEX';
-								$aColumns = array($sField);
-								$aLength = self::DBGetIndexesLength($sClass, $aColumns, $aTableInfo);
-								if (!is_null($aLength[0]))
-								{
-									$sColumns .= ' ('.$aLength[0].')';
-								}
-							}
-							$sSugFix = "ALTER TABLE `$sTable` ADD $sIndexType `$sIndexName` ($sColumns)";
-							$aSugFix[$sClass][$sAttCode][] = $sSugFix;
-							if ($bFullTextIndexNeeded)
-							{
-								// MySQL does not support multi fulltext index creation in a single query (mysql_errno = 1795)
-								$aPostTableAlteration[$sTable][] = $sSugFix;
-							}
-							elseif ($bTableToCreate)
-							{
-								$aCreateTableItems[$sTable][] = "$sIndexType `$sIndexName` ($sColumns)";
-							}
-							else
-							{
-								$aAlterTableItems[$sTable][] = "ADD $sIndexType `$sIndexName` ($sColumns)";
+								$aAlterTableItems[$sTable][] = "ADD INDEX `$sField` ($sColumns)";
 							}
 						}

@@ -5354,24 +5096,12 @@ abstract class MetaModel
 						$sAlterTableItemsAfterChange = '';
 						if ($bIndexNeeded)
 						{
+							$aColumns = array($sField);
+							$aLength = self::DBGetIndexesLength($sClass, $aColumns, $aTableInfo);
 							$aTableInfo['Indexes'][$sField]['used'] = true;

-							if ($bFullTextIndexNeeded)
-							{
-								$sIndexType = 'FULLTEXT INDEX';
-								$aColumns = null;
-								$aLength = null;
-							}
-							else
-							{
-								$sIndexType = 'INDEX';
-								$aColumns = array($sField);
-								$aLength = self::DBGetIndexesLength($sClass, $aColumns, $aTableInfo);
-							}
-
 							if (!CMDBSource::HasIndex($sTable, $sField, $aColumns, $aLength))
 							{
-								$sIndexName = $sField;
 								$sColumns = '`'.$sField.'`';
 								if (!is_null($aLength[0]))
 								{
@@ -5381,11 +5111,16 @@ abstract class MetaModel
 								$aErrors[$sClass][$sAttCode][] = "Foreign key '$sField' in table '$sTable' should have an index";
 								if (CMDBSource::HasIndex($sTable, $sField))
 								{
-									$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` DROP INDEX `$sIndexName`";
-									$aAlterTableItems[$sTable][] = "DROP INDEX `$sIndexName`";
+									$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` DROP INDEX `$sField`";
+									$sSugFixAfterChange = "ALTER TABLE `$sTable` ADD INDEX `$sField` ($sColumns)";
+									$aAlterTableItems[$sTable][] = "DROP INDEX `$sField`";
+									$sAlterTableItemsAfterChange = "ADD INDEX `$sField` ($sColumns)";
+								}
+								else
+								{
+									$sSugFixAfterChange = "ALTER TABLE `$sTable` ADD INDEX `$sField` ($sColumns)";
+									$sAlterTableItemsAfterChange = "ADD INDEX `$sField` ($sColumns)";
 								}
-								$sSugFixAfterChange = "ALTER TABLE `$sTable` ADD $sIndexType `$sIndexName` ($sColumns)";
-								$sAlterTableItemsAfterChange = "ADD $sIndexType `$sIndexName` ($sColumns)";
 							}
 						}

@@ -5409,15 +5144,7 @@ abstract class MetaModel
 						if (!empty($sSugFixAfterChange))
 						{
 							$aSugFix[$sClass][$sAttCode][] = $sSugFixAfterChange;
-							if ($bFullTextIndexNeeded)
-							{
-								// MySQL does not support multi fulltext index creation in a single query (mysql_errno = 1795)
-								$aPostTableAlteration[$sTable][] = $sSugFixAfterChange;
-							}
-							else
-							{
-								$aAlterTableItems[$sTable][] = $sAlterTableItemsAfterChange;
-							}
+							$aAlterTableItems[$sTable][] = $sAlterTableItemsAfterChange;
 						}
 					}
 				}
@@ -5428,11 +5155,6 @@ abstract class MetaModel
 			{
 				$sIndexId = implode('_', $aColumns);

-				if (isset($aTableInfo['Indexes'][$sIndexId]['used']) && $aTableInfo['Indexes'][$sIndexId]['used'])
-				{
-					continue;
-				}
-
 				$aLength = self::DBGetIndexesLength($sClass, $aColumns, $aTableInfo);
 				$aTableInfo['Indexes'][$sIndexId]['used'] = true;

@@ -5541,10 +5263,6 @@ abstract class MetaModel
 			$sChangeList = implode(', ', $aChangeList);
 			$aCondensedQueries[] = "ALTER TABLE `$sTable` $sChangeList";
 		}
-		foreach($aPostTableAlteration  as $sTable => $aChangeList)
-		{
-			$aCondensedQueries = array_merge($aCondensedQueries, $aChangeList);
-		}

 		return array($aErrors, $aSugFix, $aCondensedQueries);
 	}
@@ -6112,10 +5830,20 @@ abstract class MetaModel

 		CMDBSource::SelectDB(self::$m_sDBName);

-        foreach(MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass)
-        {
-            $oPHPClass::OnMetaModelStarted();
-        }
+		foreach(get_declared_classes() as $sPHPClass)
+		{
+			if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
+			{
+				$aCallSpec = array($sPHPClass, 'OnMetaModelStarted');
+				call_user_func_array($aCallSpec, array());
+			}
+		}
+
+//		if (false)
+//		{
+//			echo "Debug<br/>\n";
+//			self::static_var_dump();
+//		}

 		ExpressionCache::Warmup();
 	}
@@ -6457,7 +6185,7 @@ abstract class MetaModel
 		{
 			$sQuerySign .= '_all_';
 		}
-		if (is_array($aModifierProperties) && (count($aModifierProperties) > 0))
+		if (count($aModifierProperties))
 		{
 			array_multisort($aModifierProperties);
 			$sModifierProperties = json_encode($aModifierProperties);
@@ -6570,7 +6298,7 @@ abstract class MetaModel
 	 *
 	 * @param string $sClass
 	 * @param int $iKey id value of the object to retrieve
-	 * @param bool $bMustBeFound see throws ArchivedObjectException
+	 * @param bool $bMustBeFound
 	 * @param bool $bAllowAllData if true then no rights filtering
 	 * @param null $aModifierProperties
 	 *
@@ -6637,14 +6365,12 @@ abstract class MetaModel
 		}
 		catch(Exception $e)
 		{
-			// In the finally block we will pop the pushed archived mode
-			// otherwise the application stays in ArchiveMode true which has caused hazardious behavior!
+			// We need to pop the pushed archived mode before the exception is thrown, otherwise the application stays in ArchiveMode true which has caused hazardious behavior!
+			// Note: When switching to PHP 5.6, we can use a finally block instead of duplicating this line.
+			utils::PopArchiveMode();
 			throw $e;
 		}
-		finally
-		{
-			utils::PopArchiveMode();
-		}
+		utils::PopArchiveMode();

 		if (empty($aRow))
 		{
@@ -7139,32 +6865,25 @@ abstract class MetaModel
 				{
 					// Expand the parameters for the object
 					$sName = substr($sSearch, 0, $iPos);
-					$aRegExps = array(
-                        '/(\\$)'.$sName.'-(>|&gt;)([^\\$]+)\\$/', // Support both syntaxes: $this->xxx$ or $this-&gt;xxx$ for HTML compatibility
-                        '/(%24)'.$sName.'-(>|&gt;)([^%24]+)%24/', // Support for urlencoded in HTML attributes (%20this-&gt;xxx%20)
-                    );
-					foreach($aRegExps as $sRegExp)
-                    {
-                        if(preg_match_all($sRegExp, $sInput, $aMatches))
-                        {
-                            foreach($aMatches[3] as $idx => $sPlaceholderAttCode)
-                            {
-                                try
-                                {
-                                    $sReplacement = $replace->GetForTemplate($sPlaceholderAttCode);
-                                    if($sReplacement !== null)
-                                    {
-                                        $aReplacements[] = $sReplacement;
-                                        $aSearches[] = $aMatches[1][$idx] . $sName . '-' . $aMatches[2][$idx] . $sPlaceholderAttCode . $aMatches[1][$idx];
-                                    }
-                                }
-                                catch(Exception $e)
-                                {
-                                    // No replacement will occur
-                                }
-                            }
-                        }
-                    }
+					if (preg_match_all('/\\$'.$sName.'-(>|&gt;)([^\\$]+)\\$/', $sInput, $aMatches)) // Support both syntaxes: $this->xxx$ or $this-&gt;xxx$ for HTML compatibility
+					{
+						foreach($aMatches[2] as $idx => $sPlaceholderAttCode)
+						{
+							try
+							{
+								$sReplacement = $replace->GetForTemplate($sPlaceholderAttCode);
+								if ($sReplacement !== null)
+								{
+									$aReplacements[] = $sReplacement;
+									$aSearches[] = '$'.$sName.'-'.$aMatches[1][$idx].$sPlaceholderAttCode.'$';
+								}
+							}
+							catch (Exception $e)
+							{
+								// No replacement will occur
+							}
+						}
+					}
 				}
 				else
 				{
--- a/core/modelreflection.class.inc.php
+++ b/core/modelreflection.class.inc.php
@@ -56,11 +56,6 @@ abstract class ModelReflection
 	abstract public function GetFiltersList($sClass);
 	abstract public function IsValidFilterCode($sClass, $sFilterCode);

-	/**
-	 * @param string $sOQL
-	 *
-	 * @return \DBObjectSearch
-	 */
 	abstract public function GetQuery($sOQL);

 	abstract public function DictString($sStringCode, $sDefault = null, $bUserLanguageOnly = false);
@@ -80,13 +75,6 @@ abstract class ModelReflection
 		return vsprintf($sLocalizedFormat, $aArguments);
 	}

-	/**
-	 * @param $sCode
-	 * @param string $sLabel
-	 * @param string $defaultValue
-	 *
-	 * @return \RunTimeIconSelectionField
-	 */
 	abstract public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '');
 	
 	abstract public function GetRootClass($sClass);
--- a/core/modulehandler.class.inc.php
+++ b/core/modulehandler.class.inc.php
@@ -25,7 +25,7 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

-abstract class ModuleHandlerAPI implements ModuleHandlerApiInterface
+abstract class ModuleHandlerAPI
 {
 	public static function OnMetaModelStarted()
 	{
@@ -34,19 +34,5 @@ abstract class ModuleHandlerAPI implements ModuleHandlerApiInterface
 	public static function OnMenuCreation()
 	{
 	}
-
-	public function __construct()
-    {
-    }
-
-}
-
-
-interface ModuleHandlerApiInterface
-{
-    public static function OnMetaModelStarted();
-
-    public static function OnMenuCreation();
-
-    public function __construct(); //empty params is required in order to be instantiable by MetaModel::InitClasses()
 }
+?>
--- a/core/oql/build/PHP/LexerGenerator/Exception.php
+++ b/core/oql/build/PHP/LexerGenerator/Exception.php
@@ -42,7 +42,7 @@
 * @copyright  2006 Gregory Beaver
 * @license    http://www.opensource.org/licenses/bsd-license.php New BSD License
 */
-//require_once 'PEAR/Exception.php';
+require_once 'PEAR/Exception.php';
 /**
 * @package    PHP_LexerGenerator
 * @author     Gregory Beaver <cellog@php.net>
@@ -51,5 +51,5 @@
 * @version    @package_version@
 * @since      File available since Release 0.1.0
 */
-class PHP_LexerGenerator_Exception extends Exception {}
+class PHP_LexerGenerator_Exception extends PEAR_Exception {}
 ?>
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -22,9 +22,6 @@ class MissingQueryArgument extends CoreException
 }


-/**
- * @method Check($oModelReflection, array $aAliases, $sSourceQuery)
- */
 abstract class Expression
 {
 	/**
@@ -47,33 +44,8 @@ abstract class Expression
 	 */
 	abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);

-	/**
-	 * recursive rendering
-	 *
-	 * @deprecated use RenderExpression
-	 *
-	 * @param array $aArgs used as input by default, or used as output if bRetrofitParams set to True
-	 * @param bool $bRetrofitParams
-	 *
-	 * @return array|string
-	 * @throws \MissingQueryArgument
-	 */
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		return $this->RenderExpression(false, $aArgs, $bRetrofitParams);
-	}
-
-	/**
-	 * recursive rendering
-	 *
-	 * @param bool $bForSQL generates code for OQL if false, for SQL otherwise
-	 * @param array $aArgs used as input by default, or used as output if bRetrofitParams set to True
-	 * @param bool $bRetrofitParams
-	 *
-	 * @return array|string
-	 * @throws \MissingQueryArgument
-	 */
-	abstract public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false);
+	// recursive rendering (aArgs used as input by default, or used as output if bRetrofitParams set to True
+	abstract public function Render(&$aArgs = null, $bRetrofitParams = false);

 	/**
 	 * @param DBObjectSearch $oSearch
@@ -86,7 +58,7 @@ abstract class Expression
 	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
-		return $this->RenderExpression(false, $aArgs);
+		return $this->Render($aArgs);
 	}

 	public function GetAttDef($aClasses = array())
@@ -124,7 +96,7 @@ abstract class Expression

 	public function serialize()
 	{
-		return base64_encode($this->RenderExpression(false));
+		return base64_encode($this->Render());
 	}

 	/**
@@ -192,7 +164,7 @@ abstract class Expression
 	 * @param string sValue The value returned by the query, for this expression
 	 * @param string sDefault The default value if no relevant label could be computed
 	 *
-	 * @return string label
+	 * @return The label
 	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
@@ -203,7 +175,7 @@ abstract class Expression
 	{
 		return array(
 			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE_RAW,
-			'oql' => $this->RenderExpression(false, $aArgs, $bRetrofitParams),
+			'oql' => $this->Render($aArgs, $bRetrofitParams),
 			'label' => $this->Display($oSearch, $aArgs, $oAttDef),
 			'source' => get_class($this),
 		);
@@ -249,7 +221,7 @@ class SQLExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSql = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		return $this->m_sSQL;
 	}
@@ -305,30 +277,7 @@ class BinaryExpression extends Expression
 	protected $m_oRightExpr;
 	protected $m_sOperator;

-	/**
-	 * @param \Expression $oLeftExpr
-	 * @param string $sOperator
-	 * @param \Expression $oRightExpr
-	 *
-	 * @throws \CoreException
-	 */
 	public function __construct($oLeftExpr, $sOperator, $oRightExpr)
-	{
-		$this->ValidateConstructorParams($oLeftExpr, $sOperator, $oRightExpr);
-
-		$this->m_oLeftExpr  = $oLeftExpr;
-		$this->m_oRightExpr = $oRightExpr;
-		$this->m_sOperator  = $sOperator;
-	}
-
-	/**
-	 * @param $oLeftExpr
-	 * @param $sOperator
-	 * @param $oRightExpr
-	 *
-	 * @throws \CoreException if one of the parameter is invalid
-	 */
-	protected function ValidateConstructorParams($oLeftExpr, $sOperator, $oRightExpr)
 	{
 		if (!is_object($oLeftExpr))
 		{
@@ -346,11 +295,9 @@ 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))
-		{
-			throw new CoreException("Expecting a List Expression object on the right hand for operator $sOperator",
-				array('found_class' => get_class($oRightExpr)));
-		}
+		$this->m_oLeftExpr  = $oLeftExpr;
+		$this->m_oRightExpr = $oRightExpr;
+		$this->m_sOperator  = $sOperator;
 	}

 	public function IsTrue()
@@ -382,11 +329,12 @@ class BinaryExpression extends Expression
 		return $this->m_sOperator;
 	}

-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		$sOperator = $this->GetOperator();
-		$sLeft = $this->GetLeftExpr()->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
-		$sRight = $this->GetRightExpr()->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
+		$sLeft = $this->GetLeftExpr()->Render($aArgs, $bRetrofitParams);
+		$sRight = $this->GetRightExpr()->Render($aArgs, $bRetrofitParams);
 		return "($sLeft $sOperator $sRight)";
 	}

@@ -501,23 +449,15 @@ class BinaryExpression extends Expression
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
 		$bReverseOperator = false;
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
 		$oLeftExpr = $this->GetLeftExpr();
 		if ($oLeftExpr instanceof FieldExpression)
 		{
-			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
+			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
 		}
 		$oRightExpr = $this->GetRightExpr();
 		if ($oRightExpr instanceof FieldExpression)
 		{
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
 			$bReverseOperator = true;
 		}

@@ -571,34 +511,17 @@ class BinaryExpression extends Expression
 		return Dict::S('Expression:Operator:'.$sOperator, " $sOperator ");
 	}

-	/**
-	 * @param DBSearch $oSearch
-	 * @param null $aArgs
-	 * @param bool $bRetrofitParams
-	 * @param null $oAttDef
-	 *
-	 * @return array
-	 * @throws \MissingQueryArgument
-	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		$bReverseOperator = false;
 		$oLeftExpr = $this->GetLeftExpr();
 		$oRightExpr = $this->GetRightExpr();

-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
+		$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());

-		$oAttDef = $oLeftExpr->GetAttDef($aClasses);
 		if (is_null($oAttDef))
 		{
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
 			$bReverseOperator = true;
 		}

@@ -612,41 +535,42 @@ class BinaryExpression extends Expression
 		{
 			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 			// $oAttDef can be different now
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
 			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);

+			$aCriteria = array_merge($aCriteriaRight, $aCriteriaLeft);
 			// switch left and right expressions so reverse the operator
 			// Note that the operation is the same so < becomes > and not >=
 			switch ($this->GetOperator())
 			{
 				case '>':
-					$sOperator = '<';
+					$aCriteria['operator'] = '<';
 					break;
 				case '<':
-					$sOperator = '>';
+					$aCriteria['operator'] = '>';
 					break;
 				case '>=':
-					$sOperator = '<=';
+					$aCriteria['operator'] = '<=';
 					break;
 				case '<=':
-					$sOperator = '>=';
+					$aCriteria['operator'] = '>=';
 					break;
 				default:
-					$sOperator = $this->GetOperator();
+					$aCriteria['operator'] = $this->GetOperator();
 					break;
 			}
-			$aCriteria = self::MergeCriteria($aCriteriaRight, $aCriteriaLeft, $sOperator);
 		}
 		else
 		{
 			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 			// $oAttDef can be different now
-			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
+			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
 			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);

-			$aCriteria = self::MergeCriteria($aCriteriaLeft, $aCriteriaRight, $this->GetOperator());
+			$aCriteria = array_merge($aCriteriaLeft, $aCriteriaRight);
+			$aCriteria['operator'] = $this->GetOperator();
 		}
-		$aCriteria['oql'] = $this->RenderExpression(false, $aArgs, $bRetrofitParams);
+		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
 		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $oAttDef);

 		if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] != $aCriteriaRight['ref']))
@@ -657,86 +581,6 @@ class BinaryExpression extends Expression

 		return $aCriteria;
 	}
-
-	protected static function MergeCriteria($aCriteriaLeft, $aCriteriaRight, $sOperator)
-	{
-		$aCriteriaOverride = array();
-		$aCriteriaOverride['operator'] = $sOperator;
-		if ($sOperator == 'OR')
-		{
-			if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] == $aCriteriaRight['ref']))
-			{
-				if (isset($aCriteriaLeft['widget']) && isset($aCriteriaRight['widget']) && ($aCriteriaLeft['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY) && ($aCriteriaRight['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY))
-				{
-					$aCriteriaOverride['operator'] = 'IN';
-					$aCriteriaOverride['is_hierarchical'] = true;
-
-					if (isset($aCriteriaLeft['values']) && isset($aCriteriaRight['values']))
-					{
-						$aCriteriaOverride['values'] = array_merge($aCriteriaLeft['values'], $aCriteriaRight['values']);
-					}
-				}
-			}
-			if (isset($aCriteriaLeft['widget']) && isset($aCriteriaRight['widget']) && ($aCriteriaLeft['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_TAG_SET) && ($aCriteriaRight['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_TAG_SET))
-			{
-				$aCriteriaOverride['operator'] = 'MATCHES';
-			}
-		}
-
-		return array_merge($aCriteriaLeft, $aCriteriaRight, $aCriteriaOverride);
-	}
-}
-
-
-/**
- * @since 2.6 N°931 tag fields
- */
-class MatchExpression extends BinaryExpression
-{
-	/** @var \FieldExpression */
-	protected $m_oLeftExpr;
-	/** @var \ScalarExpression */
-	protected $m_oRightExpr;
-
-	/**
-	 * MatchExpression constructor.
-	 *
-	 * @param \FieldExpression $oLeftExpr
-	 * @param \ScalarExpression $oRightExpr
-	 *
-	 * @throws \CoreException
-	 */
-	public function __construct(FieldExpression $oLeftExpr, ScalarExpression $oRightExpr)
-	{
-		parent::__construct($oLeftExpr, 'MATCHES', $oRightExpr);
-	}
-
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
-	{
-		$sLeft = $this->GetLeftExpr()->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
-		$sRight = $this->GetRightExpr()->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
-
-		if ($bForSQL)
-		{
-			$sRet = "MATCH ($sLeft) AGAINST ($sRight IN BOOLEAN MODE)";
-		}
-		else
-		{
-			$sRet = "$sLeft MATCHES $sRight";
-		}
-
-		return $sRet;
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		/** @var \FieldExpression $oLeft */
-		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		/** @var \ScalarExpression $oRight */
-		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-
-		return new static($oLeft, $oRight);
-	}
 }


@@ -761,7 +605,7 @@ class UnaryExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		return CMDBSource::Quote($this->m_value);
 	}
@@ -841,11 +685,7 @@ class ScalarExpression extends UnaryExpression
 				{
 					/** @var AttributeExternalKey $oAttDef */
 					$sTarget = $oAttDef->GetTargetClass();
-					$oObj = MetaModel::GetObject($sTarget, $this->m_value, false);
-					if (empty($oObj))
-					{
-						return Dict::S('Enum:Undefined');
-					}
+					$oObj = MetaModel::GetObject($sTarget, $this->m_value);

 					return $oObj->Get("friendlyname");
 				} catch (CoreException $e)
@@ -869,11 +709,11 @@ class ScalarExpression extends UnaryExpression
 			return $aCtx['date_display']->MakeValueLabel($oSearch, $this->m_value, $this->m_value);
 		}

-		return $this->RenderExpression(false, $aArgs);
+		return $this->Render($aArgs);
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		if (is_null($this->m_value))
 		{
@@ -893,23 +733,23 @@ class ScalarExpression extends UnaryExpression

 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
-		$aCriterion = array();
+		$aCriteria = array();
 		switch ((string)($this->m_value))
 		{
 			case '%Y-%m-%d':
-				$aCriterion['unit'] = 'DAY';
+				$aCriteria['unit'] = 'DAY';
 				break;
 			case '%Y-%m':
-				$aCriterion['unit'] = 'MONTH';
+				$aCriteria['unit'] = 'MONTH';
 				break;
 			case '%w':
-				$aCriterion['unit'] = 'WEEKDAY';
+				$aCriteria['unit'] = 'WEEKDAY';
 				break;
 			case '%H':
-				$aCriterion['unit'] = 'HOUR';
+				$aCriteria['unit'] = 'HOUR';
 				break;
 			default:
-				$aValue = array();
+				$aValue = array('value' => $this->GetValue());
 				if (!is_null($oAttDef))
 				{
 					switch (true)
@@ -917,108 +757,60 @@ class ScalarExpression extends UnaryExpression
 						case ($oAttDef instanceof AttributeExternalField):
 							try
 							{
-								$oFinalAttDef = $oAttDef->GetFinalAttDef();
-								if($oFinalAttDef instanceof  AttributeExternalKey)
+								if ($this->GetValue() == 0)
 								{
-									if ($this->GetValue() !== 0)
-									{
-										/** @var AttributeExternalKey $oFinalAttDef */
-										$sTarget = $oFinalAttDef->GetTargetClass();
-										$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
-										$aValue['label'] = $oObj->Get("friendlyname");
-										$aValue['value'] = $this->GetValue();
-									}
-									else
-									{
-										$aValue['label'] = Dict::S('Enum:Undefined');
-										$aValue['value'] = $this->GetValue();
-									}
+									$aValue['label'] = Dict::S('UI:UndefinedObject');
 								}
 								else
 								{
-									$aValue['label'] = $this->GetValue();
-									$aValue['value'] = $this->GetValue();
+									/** @var AttributeExternalKey $oAttDef */
+									$sTarget = $oAttDef->GetFinalAttDef()->GetTargetClass();
+									$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
+
+									$aValue['label'] = $oObj->Get("friendlyname");
 								}
-								$aCriterion['values'] = array($aValue);
 							}
 							catch (Exception $e)
 							{
 								IssueLog::Error($e->getMessage());
 							}
 							break;
-						case ($oAttDef instanceof AttributeTagSet):
-							try
-							{
-								if (!empty($this->GetValue()))
-								{
-									$aValues = array();
-									$oValue = $this->GetValue();
-									if (is_string($oValue))
-									{
-										$oValue = $oAttDef->GetExistingTagsFromString($oValue, true);
-									}
-									/** @var \ormTagSet $oValue */
-									$aTags = $oValue->GetTags();
-									foreach($aTags as $oTag)
-									{
-										$aValue['label'] = $oTag->Get('label');
-										$aValue['value'] = $oTag->Get('code');
-										$aValues[] = $aValue;
-									}
-									$aCriterion['values'] = $aValues;
-								}
-								else
-								{
-									$aCriterion['has_undefined'] = true;
-								}
-							} catch (Exception $e)
-							{
-								IssueLog::Error($e->getMessage());
-							}
-							break;
 						case $oAttDef->IsExternalKey():
 							try
 							{
-								if ($this->GetValue() != 0)
+								if ($this->GetValue() == 0)
+								{
+									$aValue['label'] = Dict::S('UI:UndefinedObject');
+								}
+								else
 								{
 									/** @var AttributeExternalKey $oAttDef */
 									$sTarget = $oAttDef->GetTargetClass();
 									$oObj = MetaModel::GetObject($sTarget, $this->GetValue(), true, true);
 									$aValue['label'] = $oObj->Get("friendlyname");
-									$aValue['value'] = $this->GetValue();
-									$aCriterion['values'] = array($aValue);
 								}
-								else
-								{
-									$aValue['label'] = Dict::S('Enum:Undefined');
-									$aValue['value'] = $this->GetValue();
-									$aCriterion['values'] = array($aValue);
-								}
-							} catch (Exception $e)
+							}
+							catch (Exception $e)
 							{
-								// This object cannot be seen... ignore
+								IssueLog::Error($e->getMessage());
 							}
 							break;
 						default:
 							try
 							{
 								$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
-								$aValue['value'] = $this->GetValue();
-								$aCriterion['values'] = array($aValue);
 							} catch (Exception $e)
 							{
 								$aValue['label'] = $this->GetValue();
-								$aValue['value'] = $this->GetValue();
-								$aCriterion['values'] = array($aValue);
 							}
 							break;
 					}
 				}
+				$aCriteria['values'] = array($aValue);
 				break;
 		}
-		$aCriterion['oql'] = $this->RenderExpression(false, $aArgs, $bRetrofitParams);
-
-		return $aCriterion;
+		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+		return $aCriteria;
 	}

 }
@@ -1049,6 +841,74 @@ class FalseExpression extends ScalarExpression
 	}
 }

+
+/**
+ * Class ExternalFieldExpression
+ *
+ * @todo verify if all required methods are implemented (ie: at first I missed the `Render` method, so  DBObjectSearch::toOQL() result was wrong)
+ *
+ */
+class ExternalFieldExpression extends UnaryExpression
+{
+    /**
+     * @var array[]                 array containing the shorthand chained fields & their classes
+     *             ['sClass']       string the Class
+     *             ['sAlias']       string the Class alias
+     *             ['sAttCode']     string the attribute code
+     */
+    protected $m_aFields = array();
+	protected $m_sName;
+
+	public function __construct($sName, $aFields)
+	{
+		parent::__construct($sName);
+
+        $this->SetFields($aFields);
+	}
+
+	public function SetFields($aFields)
+    {
+        $this->m_aFields = $aFields;
+    }
+
+    public function GetFields()
+    {
+        return $this->m_aFields;
+    }
+
+    /**
+     * used by DBObjectSearch::ShorthandExpansion(). it result in the ExternalFieldExpression being replaced by a FieldExpression mathching the final entry in self::$m_aFields
+     *
+     * @param array $aTranslationData
+     * @param bool  $bMatchAll
+     * @param bool  $bMarkFieldsAsResolved
+     *
+     * @return Expression|FieldExpression|UnaryExpression
+     */
+    public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+    {
+        $aFields = $this->GetFields();
+        $aLastField = end($aFields);
+
+        $oRet = new FieldExpression($aLastField['sAttCode'], $aLastField['sAlias']);
+
+        return $oRet;
+    }
+
+    public function Render(&$aArgs = null, $bRetrofitParams = false)
+    {
+        $aAttCode = array();
+
+        $aFields = $this->GetFields();
+        foreach ($aFields as $field) {
+            $aAttCode[] = $field['sAttCode'];
+        }
+
+        return $aFields[0]['sAlias'] . '.' . implode('->', $aAttCode);
+    }
+
+}
+
 class FieldExpression extends UnaryExpression
 {
 	protected $m_sParent;
@@ -1106,15 +966,7 @@ class FieldExpression extends UnaryExpression
 		{
 			return "`{$this->m_sName}`";
 		}
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
-		$sClass = $this->GetClassName($aClasses);
+		$sClass = $this->GetClassName($oSearch->GetJoinedClasses());
 		$sAttName = MetaModel::GetLabel($sClass, $this->m_sName);
 		if ($sClass != $oSearch->GetClass())
 		{
@@ -1125,7 +977,7 @@ class FieldExpression extends UnaryExpression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		if (empty($this->m_sParent))
 		{
@@ -1231,7 +1083,7 @@ class FieldExpression extends UnaryExpression
 	 * @param string sValue The value returned by the query, for this expression
 	 * @param string sDefault The default value if no relevant label could be computed
 	 *
-	 * @return string label
+	 * @return The label
 	 * @throws \CoreException
 	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
@@ -1471,18 +1323,11 @@ class VariableExpression extends UnaryExpression
 			return $oAttDef->GetAsPlainText($sValue);
 		}

-		return $this->RenderExpression(false, $aArgs);
+		return $this->Render($aArgs);
 	}

-	/**
-	 * @param bool $bForSQL
-	 * @param array $aArgs
-	 * @param bool $bRetrofitParams
-	 *
-	 * @return array|string
-	 * @throws \MissingQueryArgument
-	 */
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		if (is_null($aArgs))
 		{
@@ -1600,12 +1445,12 @@ class ListExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
-			$aRes[] = $oExpr->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
+			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
 		}
 		return '('.implode(', ', $aRes).')';
 	}
@@ -1621,11 +1466,12 @@ class ListExpression extends Expression

 	public function ApplyParameters($aArgs)
 	{
+		$aRes = array();
 		foreach ($this->m_aExpressions as $idx => $oExpr)
 		{
 			if ($oExpr instanceof VariableExpression)
 			{
-				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
 			}
 			else
 			{
@@ -1682,6 +1528,7 @@ class ListExpression extends Expression

 	public function RenameParam($sOldName, $sNewName)
 	{
+		$aRes = array();
 		foreach ($this->m_aExpressions as $key => $oExpr)
 		{
 			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
@@ -1690,6 +1537,7 @@ class ListExpression extends Expression

 	public function RenameAlias($sOldName, $sNewName)
 	{
+		$aRes = array();
 		foreach ($this->m_aExpressions as $key => $oExpr)
 		{
 			$oExpr->RenameAlias($sOldName, $sNewName);
@@ -1753,12 +1601,12 @@ class FunctionExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		$aRes = array();
 		foreach ($this->m_aArgs as $iPos => $oExpr)
 		{
-			$aRes[] = $oExpr->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
+			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
 		}
 		return $this->m_sVerb.'('.implode(', ', $aRes).')';
 	}
@@ -1774,6 +1622,7 @@ class FunctionExpression extends Expression

 	public function ApplyParameters($aArgs)
 	{
+		$aRes = array();
 		foreach ($this->m_aArgs as $idx => $oExpr)
 		{
 			if ($oExpr instanceof VariableExpression)
@@ -1867,7 +1716,7 @@ class FunctionExpression extends Expression
 	 * @param string sValue The value returned by the query, for this expression
 	 * @param string sDefault The default value if no relevant label could be computed
 	 *
-	 * @return string label
+	 * @return The label
 	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
@@ -1943,7 +1792,6 @@ class FunctionExpression extends Expression
 		$sVerb = '';
 		switch ($this->m_sVerb)
 		{
-			case 'ISNULL':
 			case 'NOW':
 				$sVerb = $this->VerbToNaturalLanguage();
 				break;
@@ -1957,7 +1805,7 @@ class FunctionExpression extends Expression
 				$aCtx['date_display'] = $this;
 				break;
 			default:
-				return $this->RenderExpression(false, $aArgs);
+				return $this->Render($aArgs);
 		}

 		foreach($this->m_aArgs as $oExpression)
@@ -1974,7 +1822,7 @@ class FunctionExpression extends Expression
 		{
 			$sOperation .= $sVerb;
 		}
-		return '('.$sOperation.')';
+		return $sOperation;
 	}

 	private function VerbToNaturalLanguage()
@@ -1994,7 +1842,7 @@ class FunctionExpression extends Expression
 					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
 				}
 				$aCriteria['has_undefined'] = true;
-				$aCriteria['oql'] = $this->RenderExpression(false, $aArgs, $bRetrofitParams);
+				$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
 				break;

 			case 'NOW':
@@ -2022,9 +1870,6 @@ class FunctionExpression extends Expression
 	}
 }

-/**
- * @see https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html
- */
 class IntervalExpression extends Expression
 {
 	protected $m_oValue; // expression
@@ -2053,9 +1898,9 @@ class IntervalExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
-		return 'INTERVAL '.$this->m_oValue->RenderExpression($bForSQL, $aArgs, $bRetrofitParams).' '.$this->m_sUnit;
+		return 'INTERVAL '.$this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
 	}

 	public function Browse(Closure $callback)
@@ -2120,7 +1965,7 @@ class IntervalExpression extends Expression

 	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
 	{
-		return $this->m_oValue->RenderExpression(false, $aArgs).' '.Dict::S('Expression:Unit:Long:'.$this->m_sUnit, $this->m_sUnit);
+		return $this->m_oValue->Render($aArgs).' '.Dict::S('Expression:Unit:Long:'.$this->m_sUnit, $this->m_sUnit);
 	}
 }

@@ -2145,12 +1990,12 @@ class CharConcatExpression extends Expression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
-			$sCol = $oExpr->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
+			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
 			// Concat will be globally NULL if one single argument is null !
 			$aRes[] = "COALESCE($sCol, '')";
 		}
@@ -2168,11 +2013,12 @@ class CharConcatExpression extends Expression

 	public function ApplyParameters($aArgs)
 	{
+		$aRes = array();
 		foreach ($this->m_aExpressions as $idx => $oExpr)
 		{
 			if ($oExpr instanceof VariableExpression)
 			{
-				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
 			}
 			else
 			{
@@ -2256,12 +2102,12 @@ class CharConcatWSExpression extends CharConcatExpression
 	}

 	// recursive rendering
-	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
-			$sCol = $oExpr->RenderExpression($bForSQL, $aArgs, $bRetrofitParams);
+			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
 			// Concat will be globally NULL if one single argument is null !
 			$aRes[] = "COALESCE($sCol, '')";
 		}
--- a/core/oql/oql-lexer.php
+++ b/core/oql/oql-lexer.php
@@ -115,6 +115,8 @@ class OQLLexerRaw
                '/\GWHERE/ ',
                '/\GJOIN/ ',
                '/\GON/ ',
+                '/\G->/ ',
+                '/\G:/ ',
                '/\G\// ',
                '/\G\\*/ ',
                '/\G\\+/ ',
@@ -140,7 +142,6 @@ class OQLLexerRaw
                '/\GNOT LIKE/ ',
                '/\GIN/ ',
                '/\GNOT IN/ ',
-                '/\GMATCHES/ ',
                '/\GINTERVAL/ ',
                '/\GIF/ ',
                '/\GELT/ ',
@@ -317,334 +318,339 @@ class OQLLexerRaw
    function yy_r1_8($yy_subpatterns)
    {

-	$this->token = OQLParser::MATH_DIV;
+     	$this->token = OQLParser::ARROW;
    }
    function yy_r1_9($yy_subpatterns)
    {

-	$this->token = OQLParser::MATH_MULT;
+      	$this->token = OQLParser::COLON;
    }
    function yy_r1_10($yy_subpatterns)
    {

-	$this->token = OQLParser::MATH_PLUS;
+	$this->token = OQLParser::MATH_DIV;
    }
    function yy_r1_11($yy_subpatterns)
    {

-	$this->token = OQLParser::MATH_MINUS;
+	$this->token = OQLParser::MATH_MULT;
    }
    function yy_r1_12($yy_subpatterns)
    {

-	$this->token = OQLParser::LOG_AND;
+	$this->token = OQLParser::MATH_PLUS;
    }
    function yy_r1_13($yy_subpatterns)
    {

-	$this->token = OQLParser::LOG_OR;
+	$this->token = OQLParser::MATH_MINUS;
    }
    function yy_r1_14($yy_subpatterns)
    {

-	$this->token = OQLParser::BITWISE_OR;
+	$this->token = OQLParser::LOG_AND;
    }
    function yy_r1_15($yy_subpatterns)
    {

-	$this->token = OQLParser::BITWISE_AND;
+	$this->token = OQLParser::LOG_OR;
    }
    function yy_r1_16($yy_subpatterns)
    {

-	$this->token = OQLParser::BITWISE_XOR;
+	$this->token = OQLParser::BITWISE_OR;
    }
    function yy_r1_17($yy_subpatterns)
    {

-	$this->token = OQLParser::BITWISE_LEFT_SHIFT;
+	$this->token = OQLParser::BITWISE_AND;
    }
    function yy_r1_18($yy_subpatterns)
    {

-	$this->token = OQLParser::BITWISE_RIGHT_SHIFT;
+	$this->token = OQLParser::BITWISE_XOR;
    }
    function yy_r1_19($yy_subpatterns)
    {

-	$this->token = OQLParser::COMA;
+	$this->token = OQLParser::BITWISE_LEFT_SHIFT;
    }
    function yy_r1_20($yy_subpatterns)
    {

-	$this->token = OQLParser::PAR_OPEN;
+	$this->token = OQLParser::BITWISE_RIGHT_SHIFT;
    }
    function yy_r1_21($yy_subpatterns)
    {

-	$this->token = OQLParser::PAR_CLOSE;
+	$this->token = OQLParser::COMA;
    }
    function yy_r1_22($yy_subpatterns)
    {

-	$this->token = OQLParser::REGEXP;
+	$this->token = OQLParser::PAR_OPEN;
    }
    function yy_r1_23($yy_subpatterns)
    {

-	$this->token = OQLParser::EQ;
+	$this->token = OQLParser::PAR_CLOSE;
    }
    function yy_r1_24($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_EQ;
+	$this->token = OQLParser::REGEXP;
    }
    function yy_r1_25($yy_subpatterns)
    {

-	$this->token = OQLParser::GT;
+	$this->token = OQLParser::EQ;
    }
    function yy_r1_26($yy_subpatterns)
    {

-	$this->token = OQLParser::LT;
+	$this->token = OQLParser::NOT_EQ;
    }
    function yy_r1_27($yy_subpatterns)
    {

-	$this->token = OQLParser::GE;
+	$this->token = OQLParser::GT;
    }
    function yy_r1_28($yy_subpatterns)
    {

-	$this->token = OQLParser::LE;
+	$this->token = OQLParser::LT;
    }
    function yy_r1_29($yy_subpatterns)
    {

-	$this->token = OQLParser::LIKE;
+	$this->token = OQLParser::GE;
    }
    function yy_r1_30($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_LIKE;
+	$this->token = OQLParser::LE;
    }
    function yy_r1_31($yy_subpatterns)
    {

-	$this->token = OQLParser::IN;
+	$this->token = OQLParser::LIKE;
    }
    function yy_r1_32($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_IN;
+	$this->token = OQLParser::NOT_LIKE;
    }
    function yy_r1_33($yy_subpatterns)
    {

-    $this->token = OQLParser::MATCHES;
+	$this->token = OQLParser::IN;
    }
    function yy_r1_34($yy_subpatterns)
    {

-	$this->token = OQLParser::INTERVAL;
+	$this->token = OQLParser::NOT_IN;
    }
    function yy_r1_35($yy_subpatterns)
    {

-	$this->token = OQLParser::F_IF;
+	$this->token = OQLParser::INTERVAL;
    }
    function yy_r1_36($yy_subpatterns)
    {

-	$this->token = OQLParser::F_ELT;
+	$this->token = OQLParser::F_IF;
    }
    function yy_r1_37($yy_subpatterns)
    {

-	$this->token = OQLParser::F_COALESCE;
+	$this->token = OQLParser::F_ELT;
    }
    function yy_r1_38($yy_subpatterns)
    {

-	$this->token = OQLParser::F_ISNULL;
+	$this->token = OQLParser::F_COALESCE;
    }
    function yy_r1_39($yy_subpatterns)
    {

-	$this->token = OQLParser::F_CONCAT;
+	$this->token = OQLParser::F_ISNULL;
    }
    function yy_r1_40($yy_subpatterns)
    {

-	$this->token = OQLParser::F_SUBSTR;
+	$this->token = OQLParser::F_CONCAT;
    }
    function yy_r1_41($yy_subpatterns)
    {

-	$this->token = OQLParser::F_TRIM;
+	$this->token = OQLParser::F_SUBSTR;
    }
    function yy_r1_42($yy_subpatterns)
    {

-	$this->token = OQLParser::F_DATE;
+	$this->token = OQLParser::F_TRIM;
    }
    function yy_r1_43($yy_subpatterns)
    {

-	$this->token = OQLParser::F_DATE_FORMAT;
+	$this->token = OQLParser::F_DATE;
    }
    function yy_r1_44($yy_subpatterns)
    {

-	$this->token = OQLParser::F_CURRENT_DATE;
+	$this->token = OQLParser::F_DATE_FORMAT;
    }
    function yy_r1_45($yy_subpatterns)
    {

-	$this->token = OQLParser::F_NOW;
+	$this->token = OQLParser::F_CURRENT_DATE;
    }
    function yy_r1_46($yy_subpatterns)
    {

-	$this->token = OQLParser::F_TIME;
+	$this->token = OQLParser::F_NOW;
    }
    function yy_r1_47($yy_subpatterns)
    {

-	$this->token = OQLParser::F_TO_DAYS;
+	$this->token = OQLParser::F_TIME;
    }
    function yy_r1_48($yy_subpatterns)
    {

-	$this->token = OQLParser::F_FROM_DAYS;
+	$this->token = OQLParser::F_TO_DAYS;
    }
    function yy_r1_49($yy_subpatterns)
    {

-	$this->token = OQLParser::F_YEAR;
+	$this->token = OQLParser::F_FROM_DAYS;
    }
    function yy_r1_50($yy_subpatterns)
    {

-	$this->token = OQLParser::F_MONTH;
+	$this->token = OQLParser::F_YEAR;
    }
    function yy_r1_51($yy_subpatterns)
    {

-	$this->token = OQLParser::F_DAY;
+	$this->token = OQLParser::F_MONTH;
    }
    function yy_r1_52($yy_subpatterns)
    {

-	$this->token = OQLParser::F_HOUR;
+	$this->token = OQLParser::F_DAY;
    }
    function yy_r1_53($yy_subpatterns)
    {

-	$this->token = OQLParser::F_MINUTE;
+	$this->token = OQLParser::F_HOUR;
    }
    function yy_r1_54($yy_subpatterns)
    {

-	$this->token = OQLParser::F_SECOND;
+	$this->token = OQLParser::F_MINUTE;
    }
    function yy_r1_55($yy_subpatterns)
    {

-	$this->token = OQLParser::F_DATE_ADD;
+	$this->token = OQLParser::F_SECOND;
    }
    function yy_r1_56($yy_subpatterns)
    {

-	$this->token = OQLParser::F_DATE_SUB;
+	$this->token = OQLParser::F_DATE_ADD;
    }
    function yy_r1_57($yy_subpatterns)
    {

-	$this->token = OQLParser::F_ROUND;
+	$this->token = OQLParser::F_DATE_SUB;
    }
    function yy_r1_58($yy_subpatterns)
    {

-	$this->token = OQLParser::F_FLOOR;
+	$this->token = OQLParser::F_ROUND;
    }
    function yy_r1_59($yy_subpatterns)
    {

-	$this->token = OQLParser::F_INET_ATON;
+	$this->token = OQLParser::F_FLOOR;
    }
    function yy_r1_60($yy_subpatterns)
    {

-	$this->token = OQLParser::F_INET_NTOA;
+	$this->token = OQLParser::F_INET_ATON;
    }
    function yy_r1_61($yy_subpatterns)
    {

-	$this->token = OQLParser::BELOW;
+	$this->token = OQLParser::F_INET_NTOA;
    }
    function yy_r1_62($yy_subpatterns)
    {

-	$this->token = OQLParser::BELOW_STRICT;
+	$this->token = OQLParser::BELOW;
    }
    function yy_r1_63($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_BELOW;
+	$this->token = OQLParser::BELOW_STRICT;
    }
    function yy_r1_64($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_BELOW_STRICT;
+	$this->token = OQLParser::NOT_BELOW;
    }
    function yy_r1_65($yy_subpatterns)
    {

-	$this->token = OQLParser::ABOVE;
+	$this->token = OQLParser::NOT_BELOW_STRICT;
    }
    function yy_r1_66($yy_subpatterns)
    {

-	$this->token = OQLParser::ABOVE_STRICT;
+	$this->token = OQLParser::ABOVE;
    }
    function yy_r1_67($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_ABOVE;
+	$this->token = OQLParser::ABOVE_STRICT;
    }
    function yy_r1_68($yy_subpatterns)
    {

-	$this->token = OQLParser::NOT_ABOVE_STRICT;
+	$this->token = OQLParser::NOT_ABOVE;
    }
    function yy_r1_69($yy_subpatterns)
    {

-	$this->token = OQLParser::HEXVAL;
+	$this->token = OQLParser::NOT_ABOVE_STRICT;
    }
    function yy_r1_70($yy_subpatterns)
    {

-	$this->token = OQLParser::NUMVAL;
+	$this->token = OQLParser::HEXVAL;
    }
    function yy_r1_71($yy_subpatterns)
    {

-	$this->token = OQLParser::STRVAL;
+	$this->token = OQLParser::NUMVAL;
    }
    function yy_r1_72($yy_subpatterns)
    {

-	$this->token = OQLParser::NAME;
+	$this->token = OQLParser::STRVAL;
    }
    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;
@@ -672,25 +678,25 @@ class OQLLexer extends OQLLexerRaw

   function yylex()
   {
-        try
-        {
-          return parent::yylex();
-        }
-        catch (Exception $e)
-        {
-            $sMessage = $e->getMessage();
-            if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
-            {
-                $sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
-                if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
-                {
-                    $iLine = $aMatches[1];
-                    $sUnexpected = $aMatches[2];
-                    throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
-                }
-            }
-            // Default: forward the exception
-            throw $e;
+      try
+      {
+      	return parent::yylex();
+		}
+		catch (Exception $e)
+		{
+			$sMessage = $e->getMessage();
+			if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
+			{
+				$sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
+				if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
+				{
+					$iLine = $aMatches[1];
+					$sUnexpected = $aMatches[2];
+					throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
+				}
+			}
+			// Default: forward the exception
+			throw $e;
 		}
 	}
 }
--- a/core/oql/oql-lexer.plex
+++ b/core/oql/oql-lexer.plex
@@ -88,6 +88,8 @@ where	     = "WHERE"
 join	     = "JOIN"
 on	        = "ON"
 coma       = ","
+arrow      = "->"
+colon      = ":"
 par_open   = "("
 par_close  = ")"
 math_div   = "/"
@@ -139,7 +141,6 @@ f_round    = "ROUND"
 f_floor    = "FLOOR"
 f_inet_aton = "INET_ATON"
 f_inet_ntoa = "INET_NTOA"
-matches          = "MATCHES"
 below            = "BELOW"
 below_strict     = "BELOW STRICT"
 not_below        = "NOT BELOW"
@@ -171,7 +172,7 @@ numval     = /([0-9]+)/
 strval     = /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
 name       = /([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/
 varname    = /:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/
-dot       = "."
+dot        = "."
 */

 /*!lex2php
@@ -199,6 +200,12 @@ join {
 on {
 	$this->token = OQLParser::ON;
 }
+arrow {
+     	$this->token = OQLParser::ARROW;
+}
+colon {
+      	$this->token = OQLParser::COLON;
+}
 math_div {
 	$this->token = OQLParser::MATH_DIV;
 }
@@ -274,9 +281,6 @@ in {
 not_in {
 	$this->token = OQLParser::NOT_IN;
 }
-matches {
-    $this->token = OQLParser::MATCHES;
-}
 interval {
 	$this->token = OQLParser::INTERVAL;
 }
@@ -400,6 +404,7 @@ varname {
 dot {
 	$this->token = OQLParser::DOT;
 }
+
 */

 }
@@ -423,25 +428,25 @@ class OQLLexer extends OQLLexerRaw

   function yylex()
   {
-        try
-        {
-          return parent::yylex();
-        }
-        catch (Exception $e)
-        {
-            $sMessage = $e->getMessage();
-            if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
-            {
-                $sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
-                if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
-                {
-                    $iLine = $aMatches[1];
-                    $sUnexpected = $aMatches[2];
-                    throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
-                }
-            }
-            // Default: forward the exception
-            throw $e;
+      try
+      {
+      	return parent::yylex();
+		}
+		catch (Exception $e)
+		{
+			$sMessage = $e->getMessage();
+			if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
+			{
+				$sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
+				if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
+				{
+					$iLine = $aMatches[1];
+					$sUnexpected = $aMatches[2];
+					throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
+				}
+			}
+			// Default: forward the exception
+			throw $e;
 		}
 	}
 }
--- a/core/oql/oql-parser.php
+++ b/core/oql/oql-parser.php
--- a/core/oql/oql-parser.y
+++ b/core/oql/oql-parser.y
@@ -16,7 +16,7 @@ Example:
 %left TIMES DIVIDE MOD.
 %right EXP NOT.

-later : solve the 2 remaining shift-reduce conflicts (JOIN)
+TODO : solve the 2 remaining shift-reduce conflicts (JOIN)

 */

@@ -108,16 +108,7 @@ expression_prio1(A) ::= expression_basic(X). { A = X; }
 expression_prio1(A) ::= expression_prio1(X) operator1(Y) expression_basic(Z). { A = new BinaryOqlExpression(X, Y, Z); }

 expression_prio2(A) ::= expression_prio1(X). { A = X; }
-expression_prio2(A) ::= expression_prio2(X) operator2(Y) expression_prio1(Z).{
-    if (Y == 'MATCHES')
-    {
-        A = new MatchOqlExpression(X, Z);
-    }
-    else
-    {
-        A = new BinaryOqlExpression(X, Y, Z);
-    }
-}
+expression_prio2(A) ::= expression_prio2(X) operator2(Y) expression_prio1(Z). { A = new BinaryOqlExpression(X, Y, Z); }

 expression_prio3(A) ::= expression_prio2(X). { A = X; }
 expression_prio3(A) ::= expression_prio3(X) operator3(Y) expression_prio2(Z). { A = new BinaryOqlExpression(X, Y, Z); }
@@ -163,8 +154,16 @@ scalar(A) ::= str_scalar(X). { A = X; }
 num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); }
 str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); }

-field_id(A) ::= name(X). { A = new FieldOqlExpression(X); }
-field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); }
+basic_field_id(A) ::= name(X). { A = new FieldOqlExpression(X); }
+basic_field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); }
+
+field_id(A) ::= basic_field_id(X). { A = X; }
+field_id(A) ::= field_id(X) ARROW name(Y).
+{
+    $expr = new FieldOqlExpression(Y);
+    A = new ExternalFieldOqlExpression(X, $expr);
+}
+
 class_name(A) ::= name(X). { A=X; }


@@ -189,22 +188,18 @@ str_value(A) ::= STRVAL(X). {A=stripslashes(substr(X, 1, strlen(X) - 2));}

 operator1(A) ::= num_operator1(X). {A=X;}
 operator1(A) ::= bitwise_operator1(X). {A=X;}
-
 operator2(A) ::= num_operator2(X). {A=X;}
 operator2(A) ::= str_operator(X). {A=X;}
 operator2(A) ::= REGEXP(X). {A=X;}
 operator2(A) ::= EQ(X). {A=X;}
 operator2(A) ::= NOT_EQ(X). {A=X;}
-
 operator3(A) ::= LOG_AND(X). {A=X;}
 operator3(A) ::= bitwise_operator3(X). {A=X;}
-
 operator4(A) ::= LOG_OR(X). {A=X;}
 operator4(A) ::= bitwise_operator4(X). {A=X;}

 num_operator1(A) ::= MATH_DIV(X). {A=X;}
 num_operator1(A) ::= MATH_MULT(X). {A=X;}
-
 num_operator2(A) ::= MATH_PLUS(X). {A=X;}
 num_operator2(A) ::= MATH_MINUS(X). {A=X;}
 num_operator2(A) ::= GT(X). {A=X;}
@@ -214,13 +209,10 @@ num_operator2(A) ::= LE(X). {A=X;}

 str_operator(A) ::= LIKE(X). {A=X;}
 str_operator(A) ::= NOT_LIKE(X). {A=X;}
-str_operator(A) ::= MATCHES(X). {A=X;}

 bitwise_operator1(A) ::= BITWISE_LEFT_SHIFT(X). {A=X;}
 bitwise_operator1(A) ::= BITWISE_RIGHT_SHIFT(X). {A=X;}
-
 bitwise_operator3(A) ::= BITWISE_AND(X). {A=X;}
-
 bitwise_operator4(A) ::= BITWISE_OR(X). {A=X;}
 bitwise_operator4(A) ::= BITWISE_XOR(X). {A=X;}

--- a/core/oql/oqlinterpreter.class.inc.php
+++ b/core/oql/oqlinterpreter.class.inc.php
@@ -84,7 +84,7 @@ class OqlInterpreter
 	}

 	/**
-	 * @return \OqlObjectQuery|\OqlUnionQuery
+	 * @return OqlQuery
 	 * @throws \OQLException
 	 */
 	public function ParseQuery()
--- a/core/oql/oqlquery.class.inc.php
+++ b/core/oql/oqlquery.class.inc.php
@@ -160,26 +160,6 @@ class BinaryOqlExpression extends BinaryExpression implements CheckableExpressio
 	}
 }

-class MatchOqlExpression extends MatchExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		$this->m_oLeftExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
-		$this->m_oRightExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
-
-		// Only field MATCHES scalar is allowed
-		if (!$this->m_oLeftExpr instanceof FieldExpression)
-		{
-			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oLeftExpr->RenderExpression(true), 0));
-		}
-		// Only field MATCHES scalar is allowed
-		if (!$this->m_oRightExpr instanceof ScalarExpression)
-		{
-			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oRightExpr->RenderExpression(true), 0));
-		}
-	}
-}
-
 class ScalarOqlExpression extends ScalarExpression implements CheckableExpression
 {
 	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
@@ -188,9 +168,108 @@ class ScalarOqlExpression extends ScalarExpression implements CheckableExpressio
 	}
 }

+class ExternalFieldOqlExpression extends ExternalFieldExpression implements CheckableExpression
+{
+	protected $m_aExpression = array();
+	protected $m_sName = null;
+
+
+	function __construct($oExpr1, $oExpr2)
+	{
+		$this->m_sName = '';
+
+        if ($oExpr1 instanceof ExternalFieldOqlExpression)
+        {
+            $this->m_aExpression = $oExpr1->GetExpressions();
+        }
+        else
+        {
+            $this->m_aExpression[] = $oExpr1;
+        }
+        $this->m_aExpression[] = $oExpr2;
+		$this->m_sName = $oExpr1->GetValue().'->'.$oExpr2->GetValue();
+
+
+        parent::__construct($this->m_sName, $this->m_aExpression);
+ 	}
+
+    public function GetExpressions()
+    {
+        return $this->m_aExpression;
+    }
+
+    public function GetName()
+    {
+    	return $this->m_sName;
+    }
+
+	/**
+	 * 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 Aliases to class names (for the current query)
+	 * @param string $sSourceQuery For the reporting
+	 *
+	 * @throws OqlNormalizeException
+	 */
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		$sParentAlias = null;
+		foreach($this->m_aExpression as $i => $oFieldOqlExpression)
+		{
+
+		    if (is_null($sParentAlias))
+			{
+				$oFieldOqlExpression->RefreshAlias($oModelReflection, $aAliases, $sSourceQuery, FieldOqlExpression::ALLOW_EXTERNAL_FIELDS);
+			}
+			else
+			{
+				$oFieldOqlExpression->SetParent($sParentAlias);
+			}
+			$oFieldOqlExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
+
+			$sClass = $aAliases[$oFieldOqlExpression->GetParent()];
+
+			$bLastIteration = ($i == (count($this->m_aExpression) - 1));
+
+			if (!$bLastIteration)
+            {
+                if ($oFieldOqlExpression->GetName() == 'id')
+                {
+                    $sTargetClass = null;
+                }
+                else
+                {
+                    $sTargetClass = $oModelReflection->GetAttributeProperty($sClass, $oFieldOqlExpression->GetName(), 'targetclass');
+                }
+
+                if (is_null($sTargetClass))
+                {
+                    throw new OqlNormalizeException('Forbidden operation for attribute', $sSourceQuery, $oFieldOqlExpression->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
+                }
+                $aAliases[$sTargetClass] = $sTargetClass;
+                $sParentAlias = $sTargetClass;
+            }
+            else
+            {
+                if ($oFieldOqlExpression->GetName() != 'id')  //on lastIteration, the id field can be used, but since it is not supporter by IsValidAttCode we must avoid it
+                {
+                     if (!$oModelReflection->IsValidAttCode($sClass, $oFieldOqlExpression->GetName()))
+                     {
+                         throw new OqlNormalizeException('Invalid attribute', $sSourceQuery, $oFieldOqlExpression->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
+                     }
+                }
+            }
+		}
+	}
+}
+
 class FieldOqlExpression extends FieldExpression implements CheckableExpression
 {
-	protected $m_oParent;
+    const ALLOW_EXTERNAL_FIELDS = true;
+    const DISALLOW_EXTERNAL_FIELDS = false;
+    protected $m_oParent;
 	protected $m_oName;

 	public function __construct($oName, $oParent = null)
@@ -223,23 +302,7 @@ class FieldOqlExpression extends FieldExpression implements CheckableExpression
 		{
 			// Try to find an alias
 			// Build an array of field => array of aliases
-			$aFieldClasses = array();
-			foreach($aAliases as $sAlias => $sReal)
-			{
-				foreach($oModelReflection->GetFiltersList($sReal) as $sAnFltCode)
-				{
-					$aFieldClasses[$sAnFltCode][] = $sAlias;
-				}
-			}
-			if (!array_key_exists($sFltCode, $aFieldClasses))
-			{
-				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
-			}
-			if (count($aFieldClasses[$sFltCode]) > 1)
-			{
-				throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails());
-			}
-			$sClassAlias = $aFieldClasses[$sFltCode][0];
+			$this->RefreshAlias($oModelReflection, $aAliases, $sSourceQuery);
 		}
 		else
 		{
@@ -254,6 +317,62 @@ class FieldOqlExpression extends FieldExpression implements CheckableExpression
 			}
 		}
 	}
+
+    /**
+     * Used by self::Check and ExternalFieldOqlExpression::Check => throws exception if error
+     *
+     * this method has a side effect : if not previously set $this->m_sParent if computed then set.
+     *
+     * @param \ModelReflection $oModelReflection
+     * @param                  $aAliases
+     * @param                  $sSourceQuery
+     * @param bool             $bAllowExternalFields  should external fields be authorised? used only by @see ExternalFieldOqlExpression
+     *
+     * @throws OqlNormalizeException
+     */
+	public function RefreshAlias(ModelReflection $oModelReflection, $aAliases, $sSourceQuery, $bAllowExternalFields = self::DISALLOW_EXTERNAL_FIELDS)
+	{
+		$sClassAlias = $this->GetParent();
+		$sFltCode = $this->GetName();
+		if (empty($sClassAlias))
+		{
+			// Try to find an alias
+			// Build an array of field => array of aliases
+			$aFieldClasses = array();
+			foreach($aAliases as $sAlias => $sReal)
+			{
+				foreach($oModelReflection->GetFiltersList($sReal) as $sAnFltCode)
+				{
+					$aFieldClasses[$sAnFltCode][] = $sAlias;
+				}
+			}
+			if (!array_key_exists($sFltCode, $aFieldClasses))
+			{
+				if (count($aAliases) > 1)
+                {
+                    throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
+                }
+
+                $sClassAlias = reset($aAliases);
+			    if (self::DISALLOW_EXTERNAL_FIELDS == $bAllowExternalFields || false == $oModelReflection->IsValidAttCode($sClassAlias, $sFltCode))
+                {
+                    throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
+                }
+                $this->SetParent($sClassAlias);
+
+			}
+			elseif (count($aFieldClasses[$sFltCode]) > 1)
+			{
+				throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails());
+			}
+			else
+            {
+                $sClassAlias = $aFieldClasses[$sFltCode][0];
+                $this->SetParent($sClassAlias);
+            }
+
+		}
+	}
 }

 class VariableOqlExpression extends VariableExpression implements CheckableExpression
--- a/core/oql/version.txt
+++ b/core/oql/version.txt
@@ -1 +1 @@
-2018-08-31
+2018-04-26
--- a/core/ormcaselog.class.inc.php
+++ b/core/ormcaselog.class.inc.php
@@ -34,7 +34,7 @@ class ormCaseLog {
 	/**
 	 * Initializes the log with the first (initial) entry
 	 * @param $sLog string The text of the whole case log
-	 * @param $aIndex array The case log index
+	 * @param $aIndex hash The case log index
 	 */
 	public function __construct($sLog = '', $aIndex = array())
 	{
@@ -159,7 +159,6 @@ class ormCaseLog {
 			$aEntries[] = array(
 				'date' => '',
 				'user_login' => '',
-				'user_id' => 0,
 				'message' => $sTextEntry,
 				'message_html' => utils::TextToHtml($sTextEntry),
 			);
@@ -296,6 +295,7 @@ class ormCaseLog {
 	 */	 	
 	public function GetAsSimpleHtml($aTransfoHandler = null)
 	{
+		$sStyleCaseLogHeader = '';
 		$sStyleCaseLogEntry = '';

 		$sHtml = '<ul class="case_log_simple_html">';
@@ -513,6 +513,7 @@ class ormCaseLog {
 	public function AddLogEntry($sText, $sOnBehalfOf = '')
 	{
 		$sText = HTMLSanitizer::Sanitize($sText);
+		$bMergeEntries = false;
 		$sDate = date(AttributeDateTime::GetInternalFormat());
 		if ($sOnBehalfOf == '')
 		{
@@ -698,6 +699,7 @@ class ormCaseLog {
 	{
 		$iPos = 0;
 		$index = count($this->m_aIndex) - 1;
+		$aIndex = $this->m_aIndex;
 		while($index > $iIndex)
 		{
 			$iPos += $this->m_aIndex[$index]['separator_length'];
--- a/core/ormlinkset.class.inc.php
+++ b/core/ormlinkset.class.inc.php
@@ -74,14 +74,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 */
 	protected $iCursor = 0;

-	/**
-	 * __toString magical function overload.
-	 */
-	public function __toString()
-	{
-		return '';
-	}
-
 	/**
 	 * ormLinkSet constructor.
 	 * @param $sHostClass
@@ -539,27 +531,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		}
 	}

-	/**
-	 * Get the list of all modified (added, modified and removed) links
-	 *
-	 * @return array of link objects
-	 * @throws \Exception
-	 */
-	public function ListModifiedLinks()
-	{
-		$aAdded = $this->aAdded;
-		$aModified = $this->aModified;
-		$aRemoved = array();
-		if (count($this->aRemoved) > 0)
-		{
-			$oSearch = new DBObjectSearch($this->sClass);
-			$oSearch->AddCondition('id', $this->aRemoved, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			$aRemoved = $oSet->ToArray();
-		}
-		return array_merge($aAdded, $aModified, $aRemoved);
-	}
-
 	/**
 	 * @param DBObject $oHostObject
 	 */
--- a/core/ormpassword.class.inc.php
+++ b/core/ormpassword.class.inc.php
@@ -42,7 +42,6 @@ class ormPassword
 	public function __construct($sHash = '', $sSalt = '')
 	{
 		$this->m_sHashed = $sHash;
-		//only used for <= 2.5 hashed password
 		$this->m_sSalt = $sSalt;
 	}
 	
@@ -51,7 +50,8 @@ class ormPassword
 	 */
 	public function SetPassword($sClearTextPassword)
 	{
-		$this->m_sHashed = password_hash($sClearTextPassword, PASSWORD_DEFAULT);
+		$this->m_sSalt = SimpleCrypt::GetNewSalt();
+		$this->m_sHashed = $this->ComputeHash($sClearTextPassword);
 	}
 	
 	/**
@@ -95,19 +95,10 @@ class ormPassword
 	public function CheckPassword($sClearTextPassword)
 	{
 		$bResult = false;
-		$aInfo = password_get_info($this->m_sHashed);
-		switch ($aInfo["algo"])
+		$sHashedPwd = $this->ComputeHash($sClearTextPassword);
+		if ($this->m_sHashed == $sHashedPwd)
 		{
-			case 0:
-				//unknown, assume it's a legacy password
-				$sHashedPwd = $this->ComputeHash($sClearTextPassword);
-				if ($this->m_sHashed == $sHashedPwd)
-				{
-					$bResult = true;
-				}
-				break;
-			default:
-				$bResult = password_verify($sClearTextPassword, $this->m_sHashed);
+			$bResult = true;
 		}
 		return $bResult;
 	}
--- a/core/ormset.class.inc.php
+++ b/core/ormset.class.inc.php
@@ -1,380 +0,0 @@
-<?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/>
- *
- */
-
-/**
- * Created by PhpStorm.
- * Date: 24/08/2018
- * Time: 14:35
- */
-class ormSet
-{
-	protected $sClass; // class of the field
-	protected $sAttCode; // attcode of the field
-	protected $aOriginalObjects = null;
-
-	/**
-	 * Object from the original set, minus the removed objects
-	 */
-	protected $aPreserved = array();
-
-	/**
-	 * New items
-	 */
-	protected $aAdded = array();
-
-	/**
-	 * Removed items
-	 */
-	protected $aRemoved = array();
-
-	/**
-	 * Modified items (mass edit)
-	 */
-	protected $aModified = array();
-
-	/**
-	 * @var int Max number of tags in collection
-	 */
-	protected $iLimit;
-
-	/**
-	 * __toString magical function overload.
-	 */
-	public function __toString()
-	{
-		$aValue = $this->GetValues();
-		if (!empty($aValue))
-		{
-			return implode(', ', $aValue);
-		}
-		else
-		{
-			return ' ';
-		}
-	}
-
-	/**
-	 * ormSet constructor.
-	 *
-	 * @param string $sClass
-	 * @param string $sAttCode
-	 * @param int $iLimit
-	 *
-	 * @throws \Exception
-	 */
-	public function __construct($sClass, $sAttCode, $iLimit = 12)
-	{
-		$this->sAttCode = $sAttCode;
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		if (!$oAttDef instanceof AttributeSet)
-		{
-			throw new Exception("ormSet: field {$sClass}:{$sAttCode} is not a set");
-		}
-		$this->sClass = $sClass;
-		$this->iLimit = $iLimit;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function GetClass()
-	{
-		return $this->sClass;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function GetAttCode()
-	{
-		return $this->sAttCode;
-	}
-
-	/**
-	 *
-	 * @param array $aItems
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue when a code is invalid
-	 */
-	public function SetValues($aItems)
-	{
-		if (!is_array($aItems))
-		{
-			throw new CoreUnexpectedValue("Wrong value {$aItems} for {$this->sClass}:{$this->sAttCode}");
-		}
-
-		$aValues = array();
-		$iCount = 0;
-		$bError = false;
-		foreach($aItems as $oItem)
-		{
-			$iCount++;
-			if (($this->iLimit != 0) && ($iCount > $this->iLimit))
-			{
-				$bError = true;
-				continue;
-			}
-			$aValues[] = $oItem;
-		}
-
-		$this->aPreserved = &$aValues;
-		$this->aRemoved = array();
-		$this->aAdded = array();
-		$this->aModified = array();
-		$this->aOriginalObjects = $aValues;
-
-		if ($bError)
-		{
-			throw new CoreException("Maximum number of items ({$this->iLimit}) reached for {$this->sClass}:{$this->sAttCode}");
-		}
-	}
-
-	public function Count()
-	{
-		return count($this->aPreserved) + count($this->aAdded) - count($this->aRemoved);
-	}
-
-	/**
-	 * @return array of codes
-	 */
-	public function GetValues()
-	{
-		$aValues = array_merge($this->aPreserved, $this->aAdded);
-
-		return $aValues;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the added tags
-	 */
-	private function GetAdded()
-	{
-		return $this->aAdded;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the removed tags
-	 */
-	private function GetRemoved()
-	{
-		return $this->aRemoved;
-	}
-
-	/** Get the delta with another ItemSet
-	 *
-	 *  $aDelta['added] = array of tag codes for only the added tags
-	 *  $aDelta['removed'] = array of tag codes for only the removed tags
-	 *
-	 * @param \ormSet $oOtherSet
-	 *
-	 * @return array
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \Exception
-	 */
-	public function GetDelta(ormSet $oOtherSet)
-	{
-		$oSet = new ormSet($this->sClass, $this->sAttCode, $this->iLimit);
-		// Set the initial value
-		$aOrigItems = $this->GetValues();
-		$oSet->SetValues($aOrigItems);
-
-		// now remove everything
-		foreach($aOrigItems as $oItem)
-		{
-			$oSet->Remove($oItem);
-		}
-
-		// now add the tags of the other ItemSet
-		foreach($oOtherSet->GetValues() as $oItem)
-		{
-			$oSet->Add($oItem);
-		}
-
-		$aDelta = array();
-		$aDelta['added'] = $oSet->GetAdded();
-		$aDelta['removed'] = $oSet->GetRemoved();
-
-		return $aDelta;
-	}
-
-	/**
-	 * @return string[] list of codes for partial entries
-	 */
-	public function GetModified()
-	{
-		return $this->aModified;
-	}
-
-	/**
-	 * Apply a delta to the current ItemSet
-	 *  $aDelta['added] = array of added items
-	 *  $aDelta['removed'] = array of removed items
-	 *
-	 * @param $aDelta
-	 *
-	 * @throws \CoreException
-	 */
-	public function ApplyDelta($aDelta)
-	{
-		if (isset($aDelta['removed']))
-		{
-			foreach($aDelta['removed'] as $oItem)
-			{
-				$this->Remove($oItem);
-			}
-		}
-		if (isset($aDelta['added']))
-		{
-			foreach($aDelta['added'] as $oItem)
-			{
-				$this->Add($oItem);
-			}
-		}
-
-		// Reset the object
-		$this->SetValues($this->GetValues());
-	}
-
-	/**
-	 * @param string $oItem
-	 *
-	 * @throws \CoreException
-	 */
-	public function Add($oItem)
-	{
-		if (($this->iLimit != 0) && ($this->Count() > $this->iLimit))
-		{
-			throw new CoreException("Maximum number of items ({$this->iLimit}) reached for {$this->sClass}:{$this->sAttCode}");
-		}
-		if ($this->IsItemInList($this->aPreserved, $oItem) || $this->IsItemInList($this->aAdded, $oItem))
-		{
-			// nothing to do, already existing tag
-			return;
-		}
-		// if removed and added again
-		if (($this->RemoveItemFromList($this->aRemoved, $oItem)) !== false)
-		{
-			// put it back into preserved
-			$this->aPreserved[] = $oItem;
-			// no need to add it to aModified : was already done when calling RemoveItem method
-		}
-		else
-		{
-			$this->aAdded[] = $oItem;
-			$this->aModified[] = $oItem;
-		}
-	}
-
-	/**
-	 * @param $oItem
-	 */
-	public function Remove($oItem)
-	{
-		if ($this->IsItemInList($this->aRemoved, $oItem))
-		{
-			// nothing to do, already removed tag
-			return;
-		}
-
-		if ($this->RemoveItemFromList($this->aAdded, $oItem) !== false)
-		{
-			$this->aModified[] = $oItem;
-
-			return; // if present in added, can't be in preserved !
-		}
-
-		if ($this->RemoveItemFromList($this->aPreserved, $oItem) !== false)
-		{
-			$this->aModified[] = $oItem;
-			$this->aRemoved[] = $oItem;
-		}
-	}
-
-	private function IsItemInList($aItemList, $oItem)
-	{
-		return in_array($oItem, $aItemList);
-	}
-
-	/**
-	 * @param \DBObject[] $aItemList
-	 * @param $oItem
-	 *
-	 * @return bool|\DBObject false if not found, else the removed element
-	 */
-	private function RemoveItemFromList(&$aItemList, $oItem)
-	{
-		if (!($this->IsItemInList($aItemList, $oItem)))
-		{
-			return false;
-		}
-		foreach ($aItemList as $index => $value)
-		{
-			if ($value === $oItem)
-			{
-				unset($aItemList[$index]);
-				return $oItem;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Populates the added and removed arrays for bulk edit
-	 *
-	 * @param string[] $aItems
-	 *
-	 * @throws \CoreException
-	 */
-	public function GenerateDiffFromArray($aItems)
-	{
-		foreach($this->GetValues() as $oCurrentItem)
-		{
-			if (!in_array($oCurrentItem, $aItems))
-			{
-				$this->Remove($oCurrentItem);
-			}
-		}
-
-		foreach($aItems as $oNewItem)
-		{
-			$this->Add($oNewItem);
-		}
-	}
-
-	/**
-	 * Compare Item Set
-	 *
-	 * @param \ormSet $other
-	 *
-	 * @return bool true if same tag set
-	 */
-	public function Equals(ormSet $other)
-	{
-		return implode(', ', $this->GetValue()) === implode(', ', $other->GetValue());
-	}
-
-
-}
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2018 Combodo SARL
+// Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -85,12 +85,8 @@ class ormStopWatch
 	/**
 	 * Get the working elapsed time since the start of the stop watch
 	 * even if it is currently running
-	 *
-	 * @param AttributeDefinition oAttDef  Attribute hosting the stop watch
-	 * @param Object oObject    Hosting object (used for query parameters)
-	 *
-	 * @return int|mixed
-	 * @throws \CoreException
+	 * @param oAttDef	AttributeDefinition Attribute hosting the stop watch
+	 * @param oObject	Hosting object (used for query parameters)
 	 */
 	public function GetElapsedTime($oAttDef, $oObject)
 	{
@@ -264,16 +260,6 @@ class ormStopWatch
 		return $iRet;
 	}

-	/**
-	 * @param $oObject
-	 * @param $oAttDef
-	 * @param $iPercent
-	 * @param $iStartTime
-	 * @param $iDurationSec
-	 *
-	 * @return mixed
-	 * @throws \CoreException
-	 */
 	protected function ComputeDeadline($oObject, $oAttDef, $iPercent, $iStartTime, $iDurationSec)
 	{
 		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
@@ -281,6 +267,11 @@ class ormStopWatch
 		{
 			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
+		$aCallSpec = array($sWorkingTimeComputer, '__construct');
+		if (!is_callable($aCallSpec))
+		{
+			//throw new CoreException("Pas de constructeur pour $sWorkingTimeComputer!");
+		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = array($oComputer, 'GetDeadline');
 		if (!is_callable($aCallSpec))
@@ -294,15 +285,6 @@ class ormStopWatch
 		return $iRet;
 	}

-	/**
-	 * @param $oObject
-	 * @param $oAttDef
-	 * @param $iStartTime
-	 * @param $iEndTime
-	 *
-	 * @return mixed
-	 * @throws \CoreException
-	 */
 	protected function ComputeDuration($oObject, $oAttDef, $iStartTime, $iEndTime)
 	{
 		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
@@ -402,20 +384,7 @@ class ormStopWatch
 					$sAttCode = $oAttDef->GetCode();
 					WorkingTimeRecorder::Start($oObject, $iComputationRefTime, "ormStopWatch-Deadline-$iPercent-$sAttCode", 'Core:ExplainWTC:StopWatch-Deadline', array("Class:$sClass/Attribute:$sAttCode", $iPercent));
 				}
-				$iRemaining = $iThresholdDuration - $this->iTimeSpent;
-				if ($iRemaining < 0)
-				{
-					if (class_exists('WorkingTimeRecorder'))
-					{
-						$sClass = get_class($oObject);
-						$sKey = $oObject->GetKey();
-						$sAttCode = $oAttDef->GetCode();
-						$sDate = date('Y-m-d H:i:s', $aThresholdData['deadline']);
-						WorkingTimeRecorder::Log(WorkingTimeRecorder::TRACE_INFO, "$sClass($sKey) ormStopWatch-Deadline-$iPercent-$sAttCode ($sDate) already reached, not changed.");
-					}
-					continue;
-				}
-				$aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iLastStart, $iRemaining);
+				$aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iLastStart, $iThresholdDuration - $this->iTimeSpent);
 				// OR $aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iStarted, $iThresholdDuration);

 				if (class_exists('WorkingTimeRecorder'))
@@ -429,7 +398,7 @@ class ormStopWatch
 				$aThresholdData['triggered'] = false;
 				$aThresholdData['overrun'] = null;
 			}
-			// else
+			else
 			{
 				// The new threshold is in the past
 				// Note: the overrun can be wrong, but the correct algorithm to compute
@@ -485,10 +454,7 @@ class ormStopWatch
 					$aThresholdData['overrun'] = $iOverrun;
 				}
 			}
-			if ($aThresholdData['overrun'] == 0)
-			{
-				$aThresholdData['deadline'] = null;
-			}
+			$aThresholdData['deadline'] = null;
 		}

 		$this->iLastStart = null;
@@ -592,7 +558,7 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 								CMDBObject::SetTrackInfo("Automatic - threshold triggered");
 					
 								$oMyChange = CMDBObject::GetCurrentChange();
-								$oObj->DBUpdateTracked($oMyChange);
+								$oObj->DBUpdateTracked($oMyChange, true /*skip security*/);
 							}

 							// Activate any existing trigger
--- a/core/ormtagset.class.inc.php
+++ b/core/ormtagset.class.inc.php
@@ -1,482 +0,0 @@
-<?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/>
- *
- */
-
-/**
- * Created by PhpStorm.
- * Date: 24/08/2018
- * Time: 14:35
- */
-final class ormTagSet extends ormSet
-{
-	/**
-	 * ormTagSet constructor.
-	 *
-	 * @param string $sClass
-	 * @param string $sAttCode
-	 * @param int $iLimit
-	 *
-	 * @throws \Exception
-	 */
-	public function __construct($sClass, $sAttCode, $iLimit = 12)
-	{
-		parent::__construct($sClass, $sAttCode, $iLimit);
-	}
-
-	/**
-	 *
-	 * @param array $aTagCodes
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue when a code is invalid
-	 */
-	public function SetValues($aTagCodes)
-	{
-		if (is_null($aTagCodes))
-		{
-			$aTagCodes = array();
-		}
-		if (!is_array($aTagCodes))
-		{
-			throw new CoreUnexpectedValue("Wrong value {$aTagCodes} for {$this->sClass}:{$this->sAttCode}");
-		}
-
-		$oTags = array();
-		$iCount = 0;
-		$bError = false;
-		foreach($aTagCodes as $sTagCode)
-		{
-			$iCount++;
-			if (($this->iLimit != 0) && ($iCount > $this->iLimit))
-			{
-				$bError = true;
-				continue;
-			}
-			$oTag = $this->GetTagFromCode($sTagCode);
-			$oTags[$sTagCode] = $oTag;
-		}
-
-		$this->aPreserved = &$oTags;
-		$this->aRemoved = array();
-		$this->aAdded = array();
-		$this->aModified = array();
-		$this->aOriginalObjects = $oTags;
-
-		if ($bError)
-		{
-			throw new CoreException("Maximum number of tags ({$this->iLimit}) reached for {$this->sClass}:{$this->sAttCode}");
-		}
-	}
-
-	/**
-	 * @return array of tag codes
-	 */
-	public function GetValues()
-	{
-		$aValues = array();
-		foreach($this->aPreserved as $sTagCode => $oTag)
-		{
-			$aValues[] = $sTagCode;
-		}
-		foreach($this->aAdded as $sTagCode => $oTag)
-		{
-			$aValues[] = $sTagCode;
-		}
-
-		sort($aValues);
-
-		return $aValues;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code
-	 */
-	public function GetLabels()
-	{
-		$aTags = array();
-		/** @var \TagSetFieldData $oTag */
-		foreach($this->aPreserved as $sTagCode => $oTag)
-		{
-			try
-			{
-				$aTags[$sTagCode] = $oTag->Get('label');
-			} catch (CoreException $e)
-			{
-				IssueLog::Error($e->getMessage());
-			}
-		}
-		foreach($this->aAdded as $sTagCode => $oTag)
-		{
-			try
-			{
-				$aTags[$sTagCode] = $oTag->Get('label');
-			} catch (CoreException $e)
-			{
-				IssueLog::Error($e->getMessage());
-			}
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/**
-	 * @return array of tags indexed by code
-	 */
-	public function GetTags()
-	{
-		$aTags = array();
-		foreach($this->aPreserved as $sTagCode => $oTag)
-		{
-			$aTags[$sTagCode] = $oTag;
-		}
-		foreach($this->aAdded as $sTagCode => $oTag)
-		{
-			$aTags[$sTagCode] = $oTag;
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the added tags
-	 */
-	private function GetAddedCodes()
-	{
-		$aTags = array();
-		foreach($this->aAdded as $sTagCode => $oTag)
-		{
-			$aTags[] = $sTagCode;
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the removed tags
-	 */
-	private function GetRemovedCodes()
-	{
-		$aTags = array();
-		foreach($this->aRemoved as $sTagCode => $oTag)
-		{
-			$aTags[] = $sTagCode;
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the added tags
-	 */
-	private function GetAddedTags()
-	{
-		$aTags = array();
-		foreach($this->aAdded as $sTagCode => $oTag)
-		{
-			$aTags[$sTagCode] = $oTag;
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/**
-	 * @return array of tag labels indexed by code for only the removed tags
-	 */
-	private function GetRemovedTags()
-	{
-		$aTags = array();
-		foreach($this->aRemoved as $sTagCode => $oTag)
-		{
-			$aTags[$sTagCode] = $oTag;
-		}
-		ksort($aTags);
-
-		return $aTags;
-	}
-
-	/** Get the delta with another TagSet
-	 *
-	 *  $aDelta['added] = array of tag codes for only the added tags
-	 *  $aDelta['removed'] = array of tag codes for only the removed tags
-	 *
-	 * @param \ormTagSet $oOtherTagSet
-	 *
-	 * @return array
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \Exception
-	 */
-	public function GetDelta(ormSet $oOtherTagSet)
-	{
-		$oTag = new ormTagSet($this->sClass, $this->sAttCode, 0);
-		// Set the initial value
-		$aOrigTagCodes = $this->GetValues();
-		$oTag->SetValues($aOrigTagCodes);
-		// now remove everything
-		foreach($aOrigTagCodes as $sTagCode)
-		{
-			$oTag->Remove($sTagCode);
-		}
-		// now add the tags of the other TagSet
-		foreach($oOtherTagSet->GetValues() as $sTagCode)
-		{
-			$oTag->Add($sTagCode);
-		}
-		$aDelta = array();
-		$aDelta['added'] = $oTag->GetAddedCodes();
-		$aDelta['removed'] = $oTag->GetRemovedCodes();
-
-		return $aDelta;
-	}
-
-	/** Get the delta with another TagSet
-	 *
-	 *  $aDelta['added] = array of tag labels indexed by code for only the added tags
-	 *  $aDelta['removed'] = array of tag labels indexed by code for only the removed tags
-	 *
-	 * @param \ormTagSet $oOtherTagSet
-	 *
-	 * @return array
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \Exception
-	 */
-	public function GetDeltaTags(ormTagSet $oOtherTagSet)
-	{
-		$oTag = new ormTagSet($this->sClass, $this->sAttCode, 0);
-		// Set the initial value
-		$aOrigTagCodes = $this->GetValues();
-		$oTag->SetValues($aOrigTagCodes);
-		// now remove everything
-		foreach($aOrigTagCodes as $sTagCode)
-		{
-			$oTag->Remove($sTagCode);
-		}
-		// now add the tags of the other TagSet
-		foreach($oOtherTagSet->GetValues() as $sTagCode)
-		{
-			$oTag->Add($sTagCode);
-		}
-		$aDelta = array();
-		$aDelta['added'] = $oTag->GetAddedTags();
-		$aDelta['removed'] = $oTag->GetRemovedTags();
-
-		return $aDelta;
-	}
-
-	/**
-	 * @return string[] list of codes for partial entries
-	 */
-	public function GetModified()
-	{
-		$aModifiedTagCodes = array_keys($this->aModified);
-		sort($aModifiedTagCodes);
-
-		return $aModifiedTagCodes;
-	}
-
-	/**
-	 * Check whether a tag code is valid or not for this TagSet
-	 *
-	 * @param string $sTagCode
-	 *
-	 * @return bool
-	 */
-	public function IsValidTag($sTagCode)
-	{
-		try
-		{
-			$this->GetTagFromCode($sTagCode);
-
-			return true;
-		} catch (Exception $e)
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $sTagCode
-	 *
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 */
-	public function Add($sTagCode)
-	{
-		if (($this->iLimit != 0) && ($this->Count() == $this->iLimit))
-		{
-			throw new CoreException("Maximum number of tags ({$this->iLimit}) reached for {$this->sClass}:{$this->sAttCode}");
-		}
-		if ($this->IsTagInList($this->aPreserved, $sTagCode) || $this->IsTagInList($this->aAdded, $sTagCode))
-		{
-			// nothing to do, already existing tag
-			return;
-		}
-		// if removed then added again
-		if (($oTag = $this->RemoveTagFromList($this->aRemoved, $sTagCode)) !== false)
-		{
-			// put it back into preserved
-			$this->aPreserved[$sTagCode] = $oTag;
-			// no need to add it to aModified : was already done when calling Remove method
-		}
-		else
-		{
-			$oTag = $this->GetTagFromCode($sTagCode);
-			$this->aAdded[$sTagCode] = $oTag;
-			$this->aModified[$sTagCode] = $oTag;
-		}
-	}
-
-	/**
-	 * @param $sTagCode
-	 */
-	public function Remove($sTagCode)
-	{
-		if ($this->IsTagInList($this->aRemoved, $sTagCode))
-		{
-			// nothing to do, already removed tag
-			return;
-		}
-
-		$oTag = $this->RemoveTagFromList($this->aAdded, $sTagCode);
-		if ($oTag !== false)
-		{
-			$this->aModified[$sTagCode] = $oTag;
-
-			return; // if present in added, can't be in preserved !
-		}
-
-		$oTag = $this->RemoveTagFromList($this->aPreserved, $sTagCode);
-		if ($oTag !== false)
-		{
-			$this->aModified[$sTagCode] = $oTag;
-			$this->aRemoved[$sTagCode] = $oTag;
-		}
-	}
-
-	private function IsTagInList($aTagList, $sTagCode)
-	{
-		return isset($aTagList[$sTagCode]);
-	}
-
-	/**
-	 * @param \DBObject[] $aTagList
-	 * @param string $sTagCode
-	 *
-	 * @return bool|\DBObject false if not found, else the removed element
-	 */
-	private function RemoveTagFromList(&$aTagList, $sTagCode)
-	{
-		if (!($this->IsTagInList($aTagList, $sTagCode)))
-		{
-			return false;
-		}
-
-		$oTag = $aTagList[$sTagCode];
-		unset($aTagList[$sTagCode]);
-
-		return $oTag;
-	}
-
-	/**
-	 * @param $sTagCode
-	 *
-	 * @return DBObject tag
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreException
-	 */
-	private function GetTagFromCode($sTagCode)
-	{
-		$aAllowedTags = $this->GetAllowedTags();
-		foreach($aAllowedTags as $oAllowedTag)
-		{
-			if ($oAllowedTag->Get('code') === $sTagCode)
-			{
-				return $oAllowedTag;
-			}
-		}
-		throw new CoreUnexpectedValue("{$sTagCode} is not defined as a valid tag for {$this->sClass}:{$this->sAttCode}");
-	}
-
-	/**
-	 * @param $sTagCode
-	 *
-	 * @return DBObject tag
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreException
-	 */
-	public function GetTagFromLabel($sTagLabel)
-	{
-		$aAllowedTags = $this->GetAllowedTags();
-		foreach($aAllowedTags as $oAllowedTag)
-		{
-			if ($oAllowedTag->Get('label') === $sTagLabel)
-			{
-				return $oAllowedTag->Get('code');
-			}
-		}
-		throw new CoreUnexpectedValue("{$sTagLabel} is not defined as a valid tag for {$this->sClass}:{$this->sAttCode}");
-	}
-
-	/**
-	 * @return \TagSetFieldData[]
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 */
-	private function GetAllowedTags()
-	{
-		return TagSetFieldData::GetAllowedValues($this->sClass, $this->sAttCode);
-	}
-
-	/**
-	 * Compare Tag Set
-	 *
-	 * @param \ormTagSet $other
-	 *
-	 * @return bool true if same tag set
-	 */
-	public function Equals(ormSet $other)
-	{
-		if (!($other instanceof ormTagSet))
-		{
-			return false;
-		}
-		if ($this->GetTagDataClass() !== $other->GetTagDataClass())
-		{
-			return false;
-		}
-
-		return implode(' ', $this->GetValues()) === implode(' ', $other->GetValues());
-	}
-
-	public function GetTagDataClass()
-	{
-		return TagSetFieldData::GetTagDataClassName($this->sClass, $this->sAttCode);
-	}
-
-}
--- a/core/relationgraph.class.inc.php
+++ b/core/relationgraph.class.inc.php
@@ -433,19 +433,15 @@ class RelationGraph extends SimpleGraph
 			}
 			elseif ($oObjectNode->GetProperty('developped', false))
 			{
-				// No need to explore the underlying graph at all. We can stop here since the node has already been developped.
-				// Otherwise in case of "loops" in the graph we would recurse up to the max depth limit
-				// without producing any difference in the resulting graph... but potentially taking a LOOOONG time.
-				return;
-				
-				// Former code was
-				//$aRelatedEdges = $bDown ? $oObjectNode->GetOutgoingEdges() : $oObjectNode->GetIncomingEdges();
-				//foreach ($aRelatedEdges as $oRelatedEdge)
-				//{
-				//	$oRelatedNode = $bDown ? $oRelatedEdge->GetSinkNode() : $oRelatedEdge->GetSourceNode();
-				//	// Recurse (decrement the depth)
-				//	$this->AddRelatedObjects($sRelCode, $bDown, $oRelatedNode, $iMaxDepth - 1, $bEnableRedundancy);
-				//}
+				// No need to execute the queries again... just dig into the nodes down/up to iMaxDepth
+				//
+				$aRelatedEdges = $bDown ? $oObjectNode->GetOutgoingEdges() : $oObjectNode->GetIncomingEdges();
+				foreach ($aRelatedEdges as $oRelatedEdge)
+				{
+					$oRelatedNode = $bDown ? $oRelatedEdge->GetSinkNode() : $oRelatedEdge->GetSourceNode();
+					// Recurse (decrement the depth)
+					$this->AddRelatedObjects($sRelCode, $bDown, $oRelatedNode, $iMaxDepth - 1, $bEnableRedundancy);
+				}
 			}
 			else
 			{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bruno Da Silva	e508f645f3	advanced search: ShorthandExpansion TODOs list SVN:b1312[5765]	2018-05-02 12:19:38 +00:00
Bruno Da Silva	81f7f9d70b	advanced search: ShorthandExpansion tests - tests (rely on generated SQL/OQL strings) - removal of a BC break (added an optional parameter $bAllowExternalFields to FieldOqlExpression::RefreshAlias() ) SVN:b1312[5764]	2018-05-02 08:51:36 +00:00
Bruno Da Silva	59c9a98b87	advanced search: ShorthandExpansion on conversion To SQL - plus tests - plus implementation of ExternalFieldExpression->Render() SVN:b1312[5760]	2018-04-27 16:15:08 +00:00
Eric Espié	d57fb3e24e	Parser for Short Hand Syntax: unit tests SVN:b1312[5753]	2018-04-27 13:26:56 +00:00
Bruno Da Silva	88ae239a56	advanced search: ExternalFieldOqlExpression Check method - handling of special case for the attribute "id" - clearer error message - typo SVN:b1312[5749]	2018-04-26 15:54:34 +00:00
Eric Espié	30494756fc	Parser for Short Hand Syntax SVN:b1312[5748]	2018-04-26 15:26:41 +00:00
Eric Espié	1900546440	Parser for Short Hand Syntax (->) Check method SVN:b1312[5747]	2018-04-26 14:59:30 +00:00
Bruno Da Silva	d8dd0437b3	advanced search: ExternalFieldOqlExpression basic constructor SVN:b1312[5746]	2018-04-26 13:38:19 +00:00
Eric Espié	d1d50e0448	Parser for Short Hand Syntax (->) SVN:b1312[5745]	2018-04-26 13:12:42 +00:00
Eric Espié	1c87c15222	SVN:b1312[5740]	2018-04-26 08:56:13 +00:00
@@ -1 +1 @@
 -08-31
 -04-26