Exclude combodo-db-tools module from packages by default

Update version number for 2.5.4
N°2633 - Security hardening
2026-02-14 16:04:10 +01:00 · 2020-01-22 09:10:54 +01:00 · 2020-01-20 15:59:08 +01:00 · 2020-01-20 15:46:04 +01:00 · 2020-01-08 11:57:29 +01:00 · 2020-01-08 11:40:35 +01:00
65 changed files with 2450 additions and 104 deletions
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -704,6 +704,7 @@ EOF
 			{
 				// No rights to be here, redirect to the portal
 				header('Location: '.$ret);
+				die();
 			}
 		}
 	}
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -133,14 +133,15 @@ class UILinksWidget
 		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
 		$aRow = array();
 		$aFieldsMap = array();
+		$iKey = 0;
 		if(is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
 		{
-			$key = $linkObjOrId->GetKey();
+			$iKey = $linkObjOrId->GetKey();
 			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
-			$sPrefix .= "[$key][";
+			$sPrefix .= "[$iKey][";
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
-			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$key}";
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$iKey}";
 			$aArgs['this'] = $linkObjOrId;

 			if($bReadOnly)
@@ -154,7 +155,7 @@ class UILinksWidget
            }
            else
            {
-                $aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$key\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$key\">";
+                $aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$iKey\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$iKey\">";
                foreach($this->m_aEditableFields as $sFieldCode)
                {
                    $sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
@@ -195,7 +196,30 @@ class UILinksWidget
 			$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=\"0\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$sInputValue\">";
+
+			if ($iUniqueId > 0)
+			{
+				// Rows created with ajax call need OnLinkAdded call.
+				//
+				$oP->add_ready_script(
+					<<<EOF
+PrepareWidgets();
+oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
+EOF
+				);
+			}
+			else
+			{
+				// Rows added before loading the form don't have to call OnLinkAdded.
+				// Listeners are already present and DOM is not recreated
+				$iPositiveUniqueId = -$iUniqueId;
+				$oP->add_ready_script(<<<EOF
+oWidget{$this->m_iInputId}.AddLink($iPositiveUniqueId, $iRemoteObjKey);
+EOF
+				);
+			}
+
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.-$iUniqueId.']';
@@ -207,20 +231,12 @@ class UILinksWidget
 					cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs).
 					'</div></div></div>';
 				$aFieldsMap[$sFieldCode] = $sSafeId;
+				$oP->add_ready_script(<<<EOF
+oWidget{$this->m_iInputId}.OnValueChange($iKey, $iUniqueId, '$sFieldCode', '$sValue');
+EOF
+					);
 			}
 			$sState = '';
-
-			// Rows created with ajax call need OnLinkAdded call.
-			// Rows added before loading the form cannot call OnLinkAdded.
-			if ($iUniqueId > 0)
-			{
-				$oP->add_ready_script(
-					<<<EOF
-PrepareWidgets();
-oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
-EOF
-				);
-			}
 		}

 		if(!$bReadOnly)
@@ -337,8 +353,19 @@ EOF
 		$sHtmlValue .= "<input type=\"hidden\" id=\"{$sFormPrefix}{$this->m_iInputId}\">\n";
 		$oValue->Rewind();
 		$aForm = array();
-		$iAddedId = 1; // Unique id for new links
-		$aAddedLinks = array();
+		$iAddedId = -1; // Unique id for new links
+
+		$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}.Init();
+EOF
+		);
+
 		while($oCurrentLink = $oValue->Fetch())
 		{
 		    // We try to retrieve the remote object as usual
@@ -357,9 +384,7 @@ EOF

            if ($oCurrentLink->IsNew())
            {
-                $key = -($iAddedId++);
-                $iUniqueId = -$key;
-	            $aAddedLinks[] = array('iAddedId' => $iUniqueId, 'iRemote' => $oCurrentLink->Get($this->m_sExtKeyToRemote));
+                $key = $iAddedId--;
            }
            else
            {
@@ -368,24 +393,6 @@ EOF
            $aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj, $key, $bReadOnly);
 		}
 		$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}.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";
--- a/core/mutex.class.inc.php
+++ b/core/mutex.class.inc.php
@@ -45,7 +45,7 @@ class iTopMutex
 	static protected $aAcquiredLocks = array(); // Number of instances of the Mutex, having the lock, in this page

 	public function __construct(
-		$sName, $sDBHost = null, $sDBUser = null, $sDBPwd = null, $bDBTlsEnabled = false, $sDBTlsCA = null
+		$sName, $sDBHost = null, $sDBUser = null, $sDBPwd = null, $bDBTlsEnabled = null, $sDBTlsCA = null
 	)
 	{
 		// Compute the name of a lock for mysql
--- a/core/ormdocument.class.inc.php
+++ b/core/ormdocument.class.inc.php
@@ -126,6 +126,7 @@ class ormDocument
 	 */
 	public function GetDisplayURL($sClass, $Id, $sAttCode)
 	{
+		// TODO: When refactoring this with the URLMaker system, mind to also change calls in the portal (look for the "p_object_document_display" route)
 		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode";
 	}

@@ -137,6 +138,7 @@ class ormDocument
 	{
 		// Compute a signature to reset the cache anytime the data changes (this is acceptable if used only with icon files)
 		$sSignature = md5($this->GetData());
+		// TODO: When refactoring this with the URLMaker system, mind to also change calls in the portal (look for the "p_object_document_display" route)
 		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode&s=$sSignature&cache=86400";
 	}

--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -1,5 +1,5 @@
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.5.2";
+$version: "v2.5.4";

 // Base colors
 $gray-base:              #000 !default;
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -327,10 +327,10 @@ a.small_action {
  padding-left: 5px;
  padding-top: 2px;
  padding-bottom: 2px;
-  background: #ea7d1e url(../images/actions_left.png?v=v2.5.2) no-repeat left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.5.4) no-repeat left;
 }
 .actions_details span {
-  background: url(../images/actions_right.png?v=v2.5.2) no-repeat right;
+  background: url(../images/actions_right.png?v=v2.5.4) no-repeat right;
  color: #fff;
  font-weight: bold;
  padding-top: 2px;
@@ -504,7 +504,7 @@ div.actions_menu > ul {
  nowidth: 70px;
  padding-left: 5px;
  /* Nasty work-around for IE... en attendant mieux */
-  background: #ea7d1e url(../images/actions_left.png?v=v2.5.2) no-repeat top left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.5.4) no-repeat top left;
  cursor: pointer;
  margin: 0;
 }
@@ -516,7 +516,7 @@ div.actions_menu > ul > li {
  height: 17px;
  padding-right: 16px;
  padding-left: 4px;
-  background: url(../images/actions_right.png?v=v2.5.2) no-repeat top right transparent;
+  background: url(../images/actions_right.png?v=v2.5.4) no-repeat top right transparent;
  font-weight: bold;
  color: #fff;
  vertical-align: middle;
@@ -659,7 +659,7 @@ td a.dp-choose-date, a.dp-choose-date, td a.dp-choose-date:hover, a.dp-choose-da
  display: block;
  text-indent: -2000px;
  overflow: hidden;
-  background: url(../images/calendar.png?v=v2.5.2) no-repeat;
+  background: url(../images/calendar.png?v=v2.5.4) no-repeat;
 }
 td a.dp-choose-date.dp-disabled, a.dp-choose-date.dp-disabled {
  background-position: 0 -20px;
@@ -1301,19 +1301,19 @@ input.dp-applied {
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.truncated, table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, .wizContainer table.listResults tr td.truncated {
-  background: url(../images/truncated.png?v=v2.5.2) bottom repeat-x;
+  background: url(../images/truncated.png?v=v2.5.4) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.truncated, .wizContainer table.listResults tr.even td.truncated {
-  background: #f9f9f1 url(../images/truncated.png?v=v2.5.2) bottom repeat-x;
+  background: #f9f9f1 url(../images/truncated.png?v=v2.5.4) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.hover.truncated, .wizContainer table.listResults tr.even td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png?v=v2.5.2) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.5.4) bottom repeat-x;
 }
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.hover.truncated, table.listResults tr td.hover.truncated, .wizContainer table.listResults tr.odd td.hover.truncated, .wizContainer table.listResults tr td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png?v=v2.5.2) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.5.4) bottom repeat-x;
 }
 table.listResults.truncated {
  border-bottom: 0;
@@ -1421,7 +1421,7 @@ div#logo {
 div#logo div {
  height: 88px;
  width: 244px;
-  background: url(../images/itop-logo-2.png?v=v2.5.2) left no-repeat;
+  background: url(../images/itop-logo-2.png?v=v2.5.4) left no-repeat;
 }
 #left-pane .ui-layout-north {
  overflow: hidden;
@@ -1513,7 +1513,7 @@ div#logo div {
 }
 #global-search-image {
  vertical-align: middle;
-  background: url(../images/search.png?v=v2.5.2) center center no-repeat;
+  background: url(../images/search.png?v=v2.5.4) center center no-repeat;
  display: inline-block;
  width: 28px;
  height: 30px;
@@ -1542,7 +1542,7 @@ span.ui-icon {
  margin: 0 2px;
 }
 .ui-layout-button-pin-down {
-  background: url(../images/splitter-bkg.png?v=v2.5.2) transparent;
+  background: url(../images/splitter-bkg.png?v=v2.5.4) transparent;
  width: 16px;
  background-position: -144px -144px;
 }
@@ -2042,7 +2042,7 @@ img.prev, img.first, img.next, img.last {
 }
 div.actions_button {
  float: right;
-  background: #ea7d1e url("../images/actions_left.png?v=v2.5.2") no-repeat scroll left top;
+  background: #ea7d1e url("../images/actions_left.png?v=v2.5.4") no-repeat scroll left top;
  padding-left: 5px;
  margin-top: 0;
  margin-right: 10px;
@@ -2050,7 +2050,7 @@ div.actions_button {
  vertical-align: middle;
 }
 div.actions_button a, .actions_button a:hover, .actions_button a:visited {
-  background: #ea7d1e url(../images/actions_bkg.png?v=v2.5.2) no-repeat scroll right top;
+  background: #ea7d1e url(../images/actions_bkg.png?v=v2.5.4) no-repeat scroll right top;
  color: #fff;
  padding-right: 8px;
  cursor: pointer;
@@ -2074,10 +2074,10 @@ select#org_id {
  cursor: not-allowed;
 }
 .dragHover {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.5.2);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.5.4);
 }
 .edit_mode .dashlet {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.5.2);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.5.4);
  padding: 5px;
  margin: 0;
  position: relative;
@@ -2111,7 +2111,7 @@ table.prop_table {
  top: 0;
  right: 0;
  z-index: 10;
-  background: transparent url(../images/delete.png?v=v2.5.2) no-repeat center;
+  background: transparent url(../images/delete.png?v=v2.5.4) no-repeat center;
 }
 td.prop_value {
  text-align: left;
@@ -2313,17 +2313,17 @@ a.summary, a.summary:hover {
 }
 .message_info {
  border: 1px solid #993;
-  background: url(../images/info-mini.png?v=v2.5.2) 1em 1em no-repeat #ffc;
+  background: url(../images/info-mini.png?v=v2.5.4) 1em 1em no-repeat #ffc;
  padding-left: 3em;
 }
 .message_ok {
  border: 1px solid #393;
-  background: url(../images/ok.png?v=v2.5.2) 1em 1em no-repeat #cfc;
+  background: url(../images/ok.png?v=v2.5.4) 1em 1em no-repeat #cfc;
  padding-left: 3em;
 }
 .message_error {
  border: 1px solid #933;
-  background: url(../images/error.png?v=v2.5.2) 1em 1em no-repeat #fcc;
+  background: url(../images/error.png?v=v2.5.4) 1em 1em no-repeat #fcc;
  padding-left: 3em;
 }
 .fg-menu a img {
@@ -2454,18 +2454,18 @@ div.explain-printable {
 }
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
  padding-left: 20px;
-  background: url(../images/eye-open-555.png?v=v2.5.2) 2px center no-repeat;
+  background: url(../images/eye-open-555.png?v=v2.5.4) 2px center no-repeat;
 }
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
  text-decoration: line-through;
-  background: url(../images/eye-closed-555.png?v=v2.5.2) 2px center no-repeat;
+  background: url(../images/eye-closed-555.png?v=v2.5.4) 2px center no-repeat;
 }
 .printable-version legend {
  padding-left: 26px;
-  background: #1c94c4 url(../images/eye-open-fff.png?v=v2.5.2) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-open-fff.png?v=v2.5.4) 8px center no-repeat;
 }
 .printable-version .strikethrough legend {
-  background: #1c94c4 url(../images/eye-closed-fff.png?v=v2.5.2) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-closed-fff.png?v=v2.5.4) 8px center no-repeat;
 }
 .printable-version fieldset.strikethrough span {
  display: none;
@@ -2617,7 +2617,7 @@ span.search-button, span.refresh-button {
 #itop-breadcrumb .breadcrumb-item a::after {
  content: '';
  position: absolute;
-  background-image: url(../images/breadcrumb-separator.png?v=v2.5.2);
+  background-image: url(../images/breadcrumb-separator.png?v=v2.5.4);
  background-repeat: no-repeat;
  width: 8px;
  height: 16px;
--- a/data/index.php
+++ b/data/index.php
@@ -1,2 +1,20 @@
 <?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
 echo 'Access denied';
--- a/datamodels/2.x/authent-external/module.authent-external.php
+++ b/datamodels/2.x/authent-external/module.authent-external.php
@@ -27,7 +27,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/2.5.2',
+	'authent-external/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-ldap/module.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php
@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/2.5.2',
+	'authent-ldap/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/authent-local/module.authent-local.php
+++ b/datamodels/2.x/authent-local/module.authent-local.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/2.5.2',
+	'authent-local/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
+++ b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+  <menus>
+    <menu id="AdminTools" xsi:type="MenuGroup" _delta="define_if_not_exists">
+      <rank>80</rank>
+      <enable_admin_only>1</enable_admin_only>
+    </menu>
+    <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>15</rank>
+      <parent>AdminTools</parent>
+      <url>$pages/exec.php?exec_module=combodo-db-tools&amp;exec_page=dbtools.php&amp;c[menu]=DBToolsMenu</url>
+      <enable_admin_only>1</enable_admin_only>
+    </menu>
+  </menus>
+</itop_design>
--- a/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
+++ b/datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+class DatabaseAnalyzer
+{
+	var $iTimeLimitPerOperation;
+
+	public function __construct($iTimeLimitPerOperation = null)
+	{
+		$this->iTimeLimitPerOperation = $iTimeLimitPerOperation;
+	}
+
+	/**
+	 * @param $sSelWrongRecs
+	 * @param $sFixitRequest
+	 * @param $sErrorDesc
+	 * @param $sClass
+	 * @param $aErrorsAndFixes
+	 *
+	 * @throws \MySQLException
+	 */
+	private function ExecQuery($sSelWrongRecs, $sFixitRequest, $sErrorDesc, $sClass, &$aErrorsAndFixes, $aValueNames = array())
+	{
+		if (!is_null($this->iTimeLimitPerOperation))
+		{
+			set_time_limit($this->iTimeLimitPerOperation);
+		}
+
+		$aWrongRecords = CMDBSource::QueryToArray($sSelWrongRecs);
+		if (count($aWrongRecords) > 0)
+		{
+			foreach($aWrongRecords as $aRes)
+			{
+				if (!isset($aErrorsAndFixes[$sClass][$sErrorDesc]))
+				{
+					$aErrorsAndFixes[$sClass][$sErrorDesc] = array(
+						'count' => 1,
+						'query' => $sSelWrongRecs,
+					);
+					if (!empty($sFixitRequest))
+					{
+						$aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'] = array($sFixitRequest);
+					}
+				}
+				else
+				{
+					$aErrorsAndFixes[$sClass][$sErrorDesc]['count'] += 1;
+				}
+				if (empty($aValueNames))
+				{
+					$aValues = array('id' => $aRes['id']);
+				}
+				else
+				{
+					$aValues = array();
+					foreach ($aValueNames as $sValueName)
+					{
+						$aValues[$sValueName] = $aRes[$sValueName];
+					}
+				}
+
+				if (isset($aRes['value']))
+				{
+					$value = $aRes['value'];
+					$aValues['value'] = $value;
+					if (!isset($aErrorsAndFixes[$sClass][$sErrorDesc]['values'][$value]))
+					{
+						$aErrorsAndFixes[$sClass][$sErrorDesc]['values'][$value] = 1;
+					}
+					else
+					{
+						$aErrorsAndFixes[$sClass][$sErrorDesc]['values'][$value] += 1;
+					}
+				}
+				$aErrorsAndFixes[$sClass][$sErrorDesc]['res'][] = $aValues;
+			}
+		}
+	}
+
+	/**
+	 * @param $aClassSelection
+	 * @param $iShowId
+	 * @return array
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 * @throws MySQLException
+	 * @throws Exception
+	 */
+	public function CheckIntegrity($aClassSelection, $iShowId)
+	{
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+
+		$aErrorsAndFixes = array();
+
+		if (empty($aClassSelection))
+		{
+			$aClassSelection = MetaModel::GetClasses();
+		}
+		else
+		{
+			$aClasses = $aClassSelection;
+			foreach($aClasses as $sClass)
+			{
+				$aExpectedClasses = MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL);
+				$aClassSelection = array_merge($aClassSelection, $aExpectedClasses);
+			}
+			$aClassSelection = array_unique($aClassSelection);
+		}
+
+		foreach($aClassSelection as $sClass)
+		{
+			// Check uniqueness rules
+			if (method_exists('MetaModel', 'GetUniquenessRules'))
+			{
+				$aUniquenessRules = MetaModel::GetUniquenessRules($sClass);
+				foreach ($aUniquenessRules as $sUniquenessRuleId => $aUniquenessRuleProperties)
+				{
+					if ($aUniquenessRuleProperties['disabled'] === true)
+					{
+						continue;
+					}
+					$this->CheckUniquenessRule($sClass, $sUniquenessRuleId, $aUniquenessRuleProperties, $aErrorsAndFixes);
+				}
+			}
+
+			if (!MetaModel::HasTable($sClass))
+			{
+				continue;
+			}
+			$sRootClass = MetaModel::GetRootClass($sClass);
+			$sTable = MetaModel::DBGetTable($sClass);
+			$sKeyField = MetaModel::DBGetKey($sClass);
+
+
+			if (!MetaModel::IsStandaloneClass($sClass))
+			{
+				if (!MetaModel::IsRootClass($sClass))
+				{
+					$sRootTable = MetaModel::DBGetTable($sRootClass);
+					$sRootKey = MetaModel::DBGetKey($sRootClass);
+					$sFinalClassField = MetaModel::DBGetClassField($sRootClass);
+
+					$aExpectedClasses = MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL);
+					$sExpectedClasses = implode(",", CMDBSource::Quote($aExpectedClasses, true));
+
+					// Check that any record found here has its counterpart in the root table
+					//
+					$sSelect = "SELECT DISTINCT `$sTable`.`$sKeyField` AS id";
+					$sDelete = "DELETE `$sTable`";
+					$sFilter = "FROM `$sTable` LEFT JOIN `$sRootTable` ON `$sTable`.`$sKeyField` = `$sRootTable`.`$sRootKey` WHERE `$sRootTable`.`$sRootKey` IS NULL";
+					$sSelWrongRecs = "$sSelect $sFilter";
+					$sFixitRequest = "$sDelete $sFilter";
+					$this->ExecQuery($sSelWrongRecs, $sFixitRequest, Dict::Format('DBAnalyzer-Integrity-OrphanRecord', $sTable, $sRootTable), $sClass, $aErrorsAndFixes);
+
+					// Check that any record found in the root table and referring to a child class
+					// has its counterpart here (detect orphan nodes -root or in the middle of the hierarchy)
+					//
+					$sSelect = "SELECT DISTINCT `$sRootTable`.`$sRootKey` AS id";
+					$sDelete = "DELETE `$sRootTable`";
+					$sFilter = "FROM `$sRootTable` LEFT JOIN `$sTable` ON `$sRootTable`.`$sRootKey` = `$sTable`.`$sKeyField` WHERE `$sTable`.`$sKeyField` IS NULL AND `$sRootTable`.`$sFinalClassField` IN ($sExpectedClasses)";
+					$sSelWrongRecs = "$sSelect $sFilter";
+					$sFixitRequest = "$sDelete $sFilter";
+					$this->ExecQuery($sSelWrongRecs, $sFixitRequest, Dict::Format('DBAnalyzer-Integrity-OrphanRecord', $sRootTable, $sTable), $sRootClass, $aErrorsAndFixes);
+				}
+			}
+
+			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				// Skip this attribute if not defined in this table
+				if (!MetaModel::IsAttributeOrigin($sClass, $sAttCode))
+				{
+					continue;
+				}
+
+				if ($oAttDef->IsExternalKey())
+				{
+					// Check that any external field is pointing to an existing object
+					//
+					$sRemoteClass = $oAttDef->GetTargetClass();
+					$sRemoteTable = MetaModel::DBGetTable($sRemoteClass);
+					$sRemoteKey = MetaModel::DBGetKey($sRemoteClass);
+
+					$aCols = $oAttDef->GetSQLExpressions(); // Workaround a PHP bug: sometimes issuing a Notice if invoking current(somefunc())
+					$sExtKeyField = current($aCols); // get the first column for an external key
+
+					// Note: a class/table may have an external key on itself
+					$sSelect = "SELECT DISTINCT `$sTable`.`$sKeyField` AS id, `$sTable`.`$sExtKeyField` AS value";
+					$sFilter = "FROM `$sTable` LEFT JOIN `$sRemoteTable` AS `{$sRemoteTable}_1` ON `$sTable`.`$sExtKeyField` = `{$sRemoteTable}_1`.`$sRemoteKey`";
+
+					$sFilter = $sFilter." WHERE `{$sRemoteTable}_1`.`$sRemoteKey` IS NULL";
+					// Exclude the records pointing to 0/null from the errors (separate test below)
+					$sFilter .= " AND `$sTable`.`$sExtKeyField` IS NOT NULL";
+					$sFilter .= " AND `$sTable`.`$sExtKeyField` != 0";
+
+					$sSelWrongRecs = "$sSelect $sFilter";
+
+					$sErrorDesc = Dict::Format('DBAnalyzer-Integrity-InvalidExtKey', $sAttCode, $sTable, $sExtKeyField);
+					$this->ExecQuery($sSelWrongRecs, '', $sErrorDesc, $sClass, $aErrorsAndFixes);
+					// Fix it request needs the values of the enum to generate the requests
+					if (isset($aErrorsAndFixes[$sClass][$sErrorDesc]['values']))
+					{
+						$aFixit = array();
+						$aFixit[] = "-- Remove inconsistant entries:";
+						$sIds = implode(', ', array_keys($aErrorsAndFixes[$sClass][$sErrorDesc]['values']));
+						$aFixit[] = "DELETE `$sTable` FROM `$sTable` WHERE `$sTable`.`$sExtKeyField` IN ($sIds)";
+						$aFixit[] = "";
+						$aFixit[] = "-- Or fix inconsistant values: Replace XXX with the appropriate value";
+						foreach (array_keys($aErrorsAndFixes[$sClass][$sErrorDesc]['values']) as $sKey)
+						{
+							$aFixit[] = "UPDATE `$sTable` SET `$sTable`.`$sExtKeyField` = XXX WHERE `$sTable`.`$sExtKeyField` = '$sKey'";
+						}
+						$aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'] = $aFixit;
+					}
+
+					if (!$oAttDef->IsNullAllowed())
+					{
+						$sSelect = "SELECT DISTINCT `$sTable`.`$sKeyField` AS id";
+						$sDelete = "DELETE `$sTable`";
+						$sFilter = "FROM `$sTable` WHERE `$sTable`.`$sExtKeyField` IS NULL OR `$sTable`.`$sExtKeyField` = 0";
+						$sSelWrongRecs = "$sSelect $sFilter";
+						$sFixitRequest = "$sDelete $sFilter";
+						$sErrorDesc = Dict::Format('DBAnalyzer-Integrity-MissingExtKey', $sAttCode, $sTable, $sExtKeyField);
+						$this->ExecQuery($sSelWrongRecs, $sFixitRequest, $sErrorDesc, $sClass, $aErrorsAndFixes);
+						if (isset($aErrorsAndFixes[$sClass][$sErrorDesc]['count']) && ($aErrorsAndFixes[$sClass][$sErrorDesc]['count'] > 0))
+						{
+							$aFixit = $aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'];
+							$aFixit[] = "-- Alternate fix";
+							$aFixit[] = "-- Replace XXX with the appropriate value";
+							$aFixit[] = "UPDATE `$sTable` SET `$sTable`.`$sExtKeyField` = XXX WHERE `$sTable`.`$sExtKeyField` IS NULL OR `$sTable`.`$sExtKeyField` = 0";
+							$aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'] = $aFixit;
+						}
+					}
+				}
+				elseif ($oAttDef->IsDirectField() && !($oAttDef instanceof AttributeTagSet))
+				{
+					// Check that the values fit the allowed values
+					//
+					$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode);
+					if (!is_null($aAllowedValues) && count($aAllowedValues) > 0)
+					{
+						$sExpectedValues = implode(",", CMDBSource::Quote(array_keys($aAllowedValues), true));
+
+						$aCols = $oAttDef->GetSQLExpressions(); // Workaround a PHP bug: sometimes issuing a Notice if invoking current(somefunc())
+						$sMyAttributeField = current($aCols); // get the first column for the moment
+						$sSelWrongRecs = "SELECT DISTINCT `$sTable`.`$sKeyField` AS id, `$sTable`.`$sMyAttributeField` AS value FROM `$sTable` WHERE `$sTable`.`$sMyAttributeField` NOT IN ($sExpectedValues)";
+						$sErrorDesc = Dict::Format('DBAnalyzer-Integrity-InvalidValue', $sAttCode, $sTable, $sMyAttributeField);
+						$this->ExecQuery($sSelWrongRecs, '', $sErrorDesc, $sClass, $aErrorsAndFixes);
+						// Fix it request needs the values of the enum to generate the requests
+						if (isset($aErrorsAndFixes[$sClass][$sErrorDesc]['values']))
+						{
+							if (isset($aErrorsAndFixes[$sClass][$sErrorDesc]['fixit']))
+							{
+								$aFixit = $aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'];
+							}
+							else
+							{
+								$aFixit = array("-- Replace 'XXX' with the appropriate value");
+							}
+							foreach (array_keys($aErrorsAndFixes[$sClass][$sErrorDesc]['values']) as $sKey)
+							{
+								$aFixit[] = "UPDATE `$sTable` SET `$sTable`.`$sMyAttributeField` = 'XXX' WHERE `$sTable`.`$sMyAttributeField` = '$sKey'";
+							}
+							$aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'] = $aFixit;
+						}
+					}
+				}
+			}
+		}
+
+		// Check user accounts without profile
+		$sUserTable = MetaModel::DBGetTable('User');
+		$sLinkTable = MetaModel::DBGetTable('URP_UserProfile');
+		$sSelect = "SELECT DISTINCT u.id AS id, u.`login` AS value";
+		$sFilter = "FROM `$sUserTable` AS u LEFT JOIN `$sLinkTable` AS l ON l.userid = u.id WHERE l.id IS NULL";
+		$sSelWrongRecs = "$sSelect $sFilter";
+		$sFixit = "-- Remove the corresponding user(s)";
+		$this->ExecQuery($sSelWrongRecs, $sFixit, Dict::S('DBAnalyzer-Integrity-UsersWithoutProfile'), 'User', $aErrorsAndFixes);
+
+		if (!is_null($this->iTimeLimitPerOperation))
+		{
+			set_time_limit($iPreviousTimeLimit);
+		}
+		return $aErrorsAndFixes;
+	}
+
+	private function CheckUniquenessRule($sClass, $sUniquenessRuleId, $aUniquenessRuleProperties, &$aErrorsAndFixes)
+	{
+		$sOqlUniquenessQuery = "SELECT $sClass";
+		if (!(empty($sUniquenessFilter = $aUniquenessRuleProperties['filter'])))
+		{
+			$sOqlUniquenessQuery .= ' WHERE '.$sUniquenessFilter;
+		}
+		$oUniquenessQuery = DBObjectSearch::FromOQL($sOqlUniquenessQuery);
+
+		$aValueNames = array();
+		$aGroupByExpr = array();
+		foreach ($aUniquenessRuleProperties['attributes'] as $sAttributeCode)
+		{
+			$oExpr = Expression::FromOQL("$sClass.$sAttributeCode");
+			$aGroupByExpr[$sAttributeCode] = $oExpr;
+			$aValueNames[] = $sAttributeCode;
+		}
+
+		$aSelectExpr = array();
+
+		$sSQLUniquenessQuery = $oUniquenessQuery->MakeGroupByQuery(array(), $aGroupByExpr, false, $aSelectExpr);
+
+		$sSQLUniquenessQuery .= ' having count(*) > 1';
+
+		$sErrorDesc = $this->GetUniquenessRuleMessage($sClass, $sUniquenessRuleId);
+
+		$this->ExecQuery($sSQLUniquenessQuery, '', $sErrorDesc, $sClass, $aErrorsAndFixes, $aValueNames);
+		if (isset($aErrorsAndFixes[$sClass][$sErrorDesc]['res']))
+		{
+			$aFixit = array("-- In order to get the duplicates, run the following queries:");
+			foreach ($aErrorsAndFixes[$sClass][$sErrorDesc]['res'] as $aValues)
+			{
+				$oFixSearch = new DBObjectSearch($sClass);
+				foreach ($aValues as $sAttCode => $sValue)
+				{
+					$oFixSearch->AddCondition($sAttCode, $sValue, '=');
+				}
+				$aFixit[] = $oFixSearch->MakeSelectQuery().';';
+				$aFixit[] = "";
+			}
+			$aErrorsAndFixes[$sClass][$sErrorDesc]['fixit'] = $aFixit;
+		}
+
+		return;
+	}
+
+	private function GetUniquenessRuleMessage($sCurrentClass, $sUniquenessRuleId)
+	{
+		// we could add also a specific message if user is admin ("dict key is missing")
+		return Dict::Format('Core:UniquenessDefaultError', $sUniquenessRuleId);
+	}
+}
--- a/datamodels/2.x/combodo-db-tools/dbtools.php
+++ b/datamodels/2.x/combodo-db-tools/dbtools.php
@@ -0,0 +1,602 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+@include_once('../../approot.inc.php');
+@include_once('../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+require_once(APPROOT.'application/ajaxwebpage.class.inc.php');
+require_once(APPROOT.'application/startup.inc.php');
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+require_once('db_analyzer.class.inc.php');
+
+const MAX_RESULTS = 10;
+
+/**
+ * @param iTopWebPage $oP
+ * @param ApplicationContext $oAppContext
+ *
+ * @return \iTopWebPage
+ * @throws CoreException
+ * @throws DictExceptionMissingString
+ * @throws MySQLException
+ */
+function DisplayDBInconsistencies(iTopWebPage &$oP, ApplicationContext &$oAppContext)
+{
+	$iShowId = intval(utils::ReadParam('show_id', '0'));
+	$sErrorLabelSelection = utils::ReadParam('error_selection', '');
+	$sClassSelection = utils::ReadParam('class_selection', '');
+	if (!empty($sClassSelection))
+	{
+		$aClassSelection = explode(",", $sClassSelection);
+	}
+	else
+	{
+		$aClassSelection = array();
+	}
+	$sClassSelection = utils::ReadParam('class_selection', '');
+
+	$oP->SetCurrentTab(Dict::S('DBTools:Inconsistencies'));
+
+	$bRunAnalysis = intval(utils::ReadParam('run_analysis', '0'));
+	if ($bRunAnalysis)
+	{
+		$oDBAnalyzer = new DatabaseAnalyzer();
+		$aResults = $oDBAnalyzer->CheckIntegrity($aClassSelection, $iShowId);
+		if (empty($aResults))
+		{
+			$oP->p('<div class="header_message message_ok">'.Dict::S('DBTools:NoError').'</div>');
+		}
+	}
+
+	$oP->add('<div style="padding: 15px; background: #ddd;">');
+	$oP->add("<form>");
+	$oP->add("<table border=0>");
+
+	$oP->add("<tr><td>");
+	$sChecked = ($iShowId == 0) ? 'checked' : '';
+	$oP->add("<label><input type=\"radio\" $sChecked name=\"show_id\" value=\"0\">".Dict::S('DBTools:HideIds').'</label>');
+	$oP->add("</td><td>");
+	$sChecked = ($iShowId == 1) ? 'checked' : '';
+	$oP->add("<label><input type=\"radio\" $sChecked name=\"show_id\" value=\"1\">".Dict::S('DBTools:ShowIds').'</label>');
+	$oP->add("</td><td>");
+	$sChecked = ($iShowId == 3) ? 'checked' : '';
+	$oP->add("<label><input type=\"radio\" $sChecked name=\"show_id\" value=\"3\">".Dict::S('DBTools:ShowReport').'</label>');
+	$oP->add("</td></tr>\n");
+
+	$oP->add("</table><br>\n");
+
+	$oP->add("<input type=\"submit\" value=\"".Dict::S('DBTools:Analyze')."\">\n");
+	$oP->add('<input type="hidden" name="class_selection" value="'.$sClassSelection.'"/>');
+	$oP->add('<input type="hidden" name="error_selection" value="'.$sErrorLabelSelection.'"/>');
+	$oP->add('<input type="hidden" name="run_analysis" value="1"/>');
+	$oP->add('<input type="hidden" name="exec_module" value="combodo-db-tools"/>');
+	$oP->add('<input type="hidden" name="exec_page" value="dbtools.php"/>');
+	$oP->add($oAppContext->GetForForm());
+	$oP->add("</form>\n");
+	$oP->add('</div>');
+
+
+	if (!empty($sErrorLabelSelection) || !empty($sClassSelection))
+	{
+		$oP->add("<br>");
+		$oP->add("<form>");
+		$oP->add('<input type="hidden" name="show_id" value="0"/>');
+		$oP->add('<input type="hidden" name="class_selection" value=""/>');
+		$oP->add('<input type="hidden" name="error_selection" value=""/>');
+		$oP->add('<input type="hidden" name="exec_module" value="combodo-db-tools"/>');
+		$oP->add('<input type="hidden" name="exec_page" value="dbtools.php"/>');
+		$oP->add("<input type=\"submit\" value=\"".Dict::S('DBTools:ShowAll')."\">\n");
+		$oP->add("</form>\n");
+	}
+
+	if (!empty($aResults))
+	{
+
+		if ($iShowId == 3)
+		{
+			DisplayInconsistenciesReport($aResults);
+		}
+
+		$oP->p(Dict::S('DBTools:ErrorsFound'));
+
+		$oP->add('<table class="listResults"><tr><th>'.Dict::S('DBTools:Class').'</th><th>'.Dict::S('DBTools:Count').'</th><th>'.Dict::S('DBTools:Error').'</th></tr>');
+		$bTable = true;
+		foreach($aResults as $sClass => $aErrorList)
+		{
+			foreach($aErrorList as $sErrorLabel => $aError)
+			{
+				if (!empty($sErrorLabelSelection) && ($sErrorLabel != $sErrorLabelSelection))
+				{
+					continue;
+				}
+
+				if (!$bTable)
+				{
+					$oP->add('<br>');
+					$oP->add('<table class="listResults"><tr><th></th><th>Class</th><th>Count</th><th>Error</th></tr>');
+					$bTable = true;
+				}
+
+				$oP->add('<tr>');
+
+
+				$oP->add('<td>'.MetaModel::GetName($sClass).' ('.$sClass.')</td>');
+				$iCount = $aError['count'];
+				$oP->add('<td>'.$iCount.'</td>');
+				$oP->add('<td>'.$sErrorLabel.'</td>');
+				$oP->add('</tr>');
+
+				if ($iShowId > 0)
+				{
+					$oP->add('</table>');
+					$bTable = false;
+					$oP->p(Dict::S('DBTools:SQLquery'));
+					$sQuery = $aError['query'];
+					$oP->add('<div style="padding: 15px; background: #f1f1f1;">');
+					$oP->add('<code>'.$sQuery.'</code>');
+					$oP->add('</div>');
+
+					if (isset($aError['fixit']))
+					{
+						$oP->p(Dict::S('DBTools:FixitSQLquery'));
+						$aQueries = $aError['fixit'];
+						$oP->add('<div style="padding: 15px; background: #f1f1f1;">');
+						foreach($aQueries as $sFixQuery)
+						{
+							$oP->add('<pre>'.$sFixQuery.'</pre>');
+						}
+						$oP->add('<br></div>');
+					}
+
+					$oP->p(Dict::S('DBTools:SQLresult'));
+					$sQueryResult = '';
+					$iCount = count($aError['res']);
+					$iMaxCount = MAX_RESULTS;
+					foreach($aError['res'] as $aRes)
+					{
+						$iMaxCount--;
+						if ($iMaxCount < 0)
+						{
+							$sQueryResult .= 'Displayed '.MAX_RESULTS."/$iCount results.<br>";
+							break;
+						}
+						foreach($aRes as $sKey => $sValue)
+						{
+							$sQueryResult .= "'$sKey'='$sValue'&nbsp;";
+						}
+						$sQueryResult .= '<br>';
+					}
+					$oP->add('<div style="padding: 15px; background: #f1f1f1;">');
+					$oP->add('<code>'.$sQueryResult.'</code>');
+					$oP->add('</div>');
+				}
+			}
+		}
+		$oP->add('</table>');
+	}
+	return $oP;
+}
+
+/**
+ * @param $aResults
+ *
+ * @return mixed
+ * @throws CoreException
+ * @throws DictExceptionMissingString
+ */
+function DisplayInconsistenciesReport($aResults)
+{
+	$sDBToolsFolder = str_replace("\\", '/', APPROOT.'log/');
+	$sReportFile = 'dbtools-report-'.date('Y-m-d-H-i-s');
+
+	$fReport = fopen($sDBToolsFolder.$sReportFile.'.txt', 'w');
+	fwrite($fReport, 'Database Maintenance tools: '.date('Y-m-d H:i:s')."\r\n");
+	foreach($aResults as $sClass => $aErrorList)
+	{
+		fwrite($fReport, '');
+		foreach($aErrorList as $sErrorLabel => $aError)
+		{
+			fwrite($fReport, "\r\n----------\r\n");
+			fwrite($fReport, 'Class: '.MetaModel::GetName($sClass).' ('.$sClass.")\r\n");
+			$iCount = $aError['count'];
+			fwrite($fReport, 'Count: '.$iCount."\r\n");
+			fwrite($fReport, 'Error: '.$sErrorLabel."\r\n");
+			$sQuery = $aError['query'];
+			fwrite($fReport, 'Query: '.$sQuery."\r\n");
+
+			if (isset($aError['fixit']))
+			{
+				fwrite($fReport, "\r\nFix it (indication):\r\n\r\n");
+				$aFixitQueries = $aError['fixit'];
+				foreach($aFixitQueries as $sFixitQuery)
+				{
+					fwrite($fReport, "$sFixitQuery\r\n");
+				}
+				fwrite($fReport, "\r\n");
+			}
+
+			$sQueryResult = '';
+			$aIdList = array();
+			foreach($aError['res'] as $aRes)
+			{
+				foreach($aRes as $sKey => $sValue)
+				{
+					$sQueryResult .= "'$sKey'='$sValue' ";
+					if ($sKey == 'id')
+					{
+						$aIdList[] = $sValue;
+					}
+				}
+				$sQueryResult .= "\r\n";
+
+			}
+			fwrite($fReport, "Result: \r\n".$sQueryResult);
+			$sIdList = '('.implode(',', $aIdList).')';
+			fwrite($fReport, 'Ids: '.$sIdList."\r\n");
+		}
+	}
+	fclose($fReport);
+
+	$oArchive = new ZipArchive();
+	$oArchive->open($sDBToolsFolder.$sReportFile.'.zip', ZipArchive::CREATE);
+	$oArchive->addFile($sDBToolsFolder.$sReportFile.'.txt', $sReportFile.'.txt');
+	$oArchive->close();
+	unlink($sDBToolsFolder.$sReportFile.'.txt');
+	$sReportFile = $sDBToolsFolder.$sReportFile.'.zip';
+
+
+	header('Content-Description: File Transfer');
+	header('Content-Type: multipart/x-zip');
+	header('Content-Disposition: inline; filename="'.basename($sReportFile).'"');
+	header('Expires: 0');
+	header('Cache-Control: must-revalidate');
+	header('Pragma: public');
+	header('Content-Length: '.filesize($sReportFile));
+	readfile($sReportFile);
+	unlink($sReportFile);
+	exit(0);
+}
+
+/**
+ * @return float
+ * @throws MySQLException
+ * @throws MySQLHasGoneAwayException
+ */
+function GetDatabaseSize()
+{
+	$sShema = CMDBSource::DBName();
+
+	$sReq = <<<EOF
+SELECT round(sum(data_length+index_length)/1024/1024,2) AS sz
+FROM information_schema.tables 
+WHERE table_schema = '$sShema';
+EOF;
+
+	$oResult = CMDBSource::Query($sReq);
+	if ($oResult !== false)
+	{
+		$aRow = $oResult->fetch_assoc();
+		$sSize = $aRow['sz'];
+		return $sSize;
+	}
+
+	return 0;
+}
+
+/**
+ * @param iTopWebPage $oP
+ * @param ApplicationContext $oAppContext
+ *
+ * @return \iTopWebPage
+ * @throws \MySQLException
+ * @throws \MySQLHasGoneAwayException
+ */
+function DisplayDatabaseInfo(iTopWebPage &$oP, ApplicationContext &$oAppContext)
+{
+	// Build HTML
+	$oP->SetCurrentTab(Dict::S('DBTools:DatabaseInfo'));
+
+	$oP->add('<div style="padding: 15px; background: #ddd;">');
+	$oP->add('<table class="listResults"><tr><th>'.Dict::S('DBTools:Base').'</th><th>'.Dict::S('DBTools:Size').'</th></tr>');
+
+	$oP->add('<tr>');
+	$oP->add('<td>');
+	$oP->add(CMDBSource::DBName());
+	$oP->add('</td>');
+	$oP->add('<td>');
+	$fSize = GetDatabaseSize();
+	$oP->add("$fSize MB");
+	$oP->add('</td>');
+	$oP->add('</tr>');
+	$oP->add('</table>');
+
+	$oP->add('</div>');
+
+	return $oP;
+}
+
+/**
+ * @param iTopWebPage $oP
+ * @param ApplicationContext $oAppContext
+ *
+ * @return \iTopWebPage
+ * @throws CoreException
+ * @throws MySQLException
+ * @throws \Exception
+ */
+function DisplayLostAttachments(iTopWebPage &$oP, ApplicationContext &$oAppContext)
+{
+	// Retrieve parameters
+	$sStepName = utils::ReadParam('step_name');
+	$aRecordsToClean = utils::ReadParam('dbt-cbx', array(), false, 'raw_data');
+
+	$iRestoredItemsCount = 0;
+	$iRecordsToCleanCount = count($aRecordsToClean);
+	$aErrorsReport = array();
+
+	$bDoAnalyze = in_array($sStepName, array('analyze', 'restore'));
+	$bDoRestore = in_array($sStepName, array('restore'));
+
+	// Build HTML
+	$oP->SetCurrentTab(Dict::S('DBTools:LostAttachments'));
+
+	$oP->add('<div class="db-tools-tab-content">');
+	$oP->add('<div class="dbt-lostattachments">');
+
+	$oP->add('<div class="header_message message_info">'.Dict::S('DBTools:LostAttachments:Disclaimer').'</div>');
+	$oP->add('<div class="dbt-steps">');
+	$oP->add('<form>');
+	$oP->add('<input type="hidden" name="exec_module" value="combodo-db-tools"/>');
+	$oP->add('<input type="hidden" name="exec_page" value="dbtools.php"/>');
+
+	// Step 1: Analyze DB
+	$oP->add('<div class="dbt-step"><p class="dbt-step-description"><span class="dbt-step-number">1.</span><span>'.Dict::S('DBTools:LostAttachments:Step:Analyze').'</span></p><button type="submit" name="step_name" value="analyze">'.Dict::S('DBTools:LostAttachments:Button:Analyze') .'</button></div>');
+
+	// Step 2: Display results
+	if($bDoAnalyze)
+	{
+		// Check if we have to restore some items first
+		if($bDoRestore)
+		{
+			foreach($aRecordsToClean as $sRecordToClean)
+			{
+				utils::PushArchiveMode(false);  // For iTop < 2.5, the application can be wrongly set to archive mode true when it fails from retrieving an object. See r5340.
+				try
+				{
+					// Retrieve attachment
+					$aLocationParts = explode('::', $sRecordToClean);
+					/** @var \DBObject $oOriginObject */
+					$oOriginObject = MetaModel::GetObject($aLocationParts[0], $aLocationParts[1], true, true);
+					/** @var \ormDocument $oOrmDocument */
+					$oOrmDocument = $oOriginObject->Get('contents');
+
+					// Retrieve target object
+					$sTargetClass = $oOriginObject->Get('item_class');
+					$sTargetId = $oOriginObject->Get('item_id');
+					/** @var \DBObject $oTargetObject */
+					$oTargetObject = MetaModel::GetObject($sTargetClass, $sTargetId, true, true);
+
+					// Put it on the target object
+					/** @var \Attachment $oAttachment */
+					$oAttachment = MetaModel::NewObject('Attachment');
+					$oAttachment->Set('item_class', $sTargetClass);
+					$oAttachment->Set('item_id', $sTargetId);
+					$oAttachment->Set('item_org_id', $oTargetObject->Get('org_id'));
+					$oAttachment->Set('contents', $oOrmDocument);
+					$oAttachment->DBInsert();
+
+					// Put history entry
+					$sHistoryEntry = Dict::Format('DBTools:LostAttachments:History', $oOrmDocument->GetFileName());
+					CMDBObject::SetTrackInfo(UserRights::GetUserFriendlyName());
+					$oChangeOp = MetaModel::NewObject('CMDBChangeOpPlugin');
+					/** @var \Change $oChange */
+					$oChange = CMDBObject::GetCurrentChange();
+					$oChangeOp->Set('change', $oChange->GetKey());
+					$oChangeOp->Set('objclass', $sTargetClass);
+					$oChangeOp->Set('objkey', $sTargetId);
+					$oChangeOp->Set('description', $sHistoryEntry);
+					$oChangeOp->DBInsert();
+
+					// Remove origin object (should only be done for InlineImage)
+					$oOriginObject->DBDelete();
+
+					$iRestoredItemsCount++;
+				}
+				catch(Exception $e)
+				{
+					$aErrorsReport[] = 'Could not restore attachment from '.$sRecordToClean.', cause: '.$e->getMessage();
+				}
+				utils::PopArchiveMode();
+			}
+		}
+
+		// Search attachments stored as inline images
+		$sInlineImageDBTable = MetaModel::DBGetTable('InlineImage');
+		$sSelWrongRecs = 'SELECT id, secret, "InlineImage" AS current_class, id AS current_id, item_class AS target_class, item_id AS target_id, contents_filename AS filename FROM '.$sInlineImageDBTable.' WHERE contents_mimetype NOT LIKE "image/%"';
+		$aWrongRecords = CMDBSource::QueryToArray($sSelWrongRecs);
+
+		$oP->add('<div class="dbt-step">');
+		$oP->add('<p class="dbt-step-description"><span class="dbt-step-number">2.</span><span>'.Dict::S('DBTools:LostAttachments:Step:AnalyzeResults').'</span></p>');
+
+		if(empty($aWrongRecords))
+		{
+			$oP->add('<div class="header_message message_ok">'.Dict::S('DBTools:LostAttachments:Step:AnalyzeResults:None').'</div>');
+		}
+		else
+		{
+			$oP->add('<div class="header_message message_error">'.Dict::Format('DBTools:LostAttachments:Step:AnalyzeResults:Some', count($aWrongRecords)).'</div>');
+
+			// Display errors as table
+			$oP->add('<table class="listResults">');
+			$oP->add('<tr><th><input type="checkbox" class="dbt-toggler-cbx" /></th><th>'.Dict::S('DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename').'</th><th>'.Dict::S('DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation').'</th><th>'.Dict::S('DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation').'</th></tr>');
+
+			foreach($aWrongRecords as $iIndex => $aWrongRecord)
+			{
+
+				$sCurrentClass = $aWrongRecord['current_class'];
+				$sCurrentId = $aWrongRecord['current_id'];
+				$sRecordToClean = Dict::S('DBTools:LostAttachments:StoredAsInlineImage');
+
+				$sTargetClass = $aWrongRecord['target_class'];
+				$sTargetId = $aWrongRecord['target_id'];
+				$sTargetLocation = '<a href="'.ApplicationContext::MakeObjectUrl($sTargetClass, $sTargetId).'" target="_blank">'.$sTargetClass.'::'.$sTargetId.'</a>';
+
+				$sFilename = '<a href="'.utils::GetAbsoluteUrlAppRoot().INLINEIMAGE_DOWNLOAD_URL.$aWrongRecord['id'].'&s='.$aWrongRecord['secret'].'" target="_blank">'.$aWrongRecord['filename'].'</a>';
+
+				$sRowClass = ($iIndex % 2 === 0) ? 'odd' : 'even'; // (Starts at 0, not 1)
+				$oP->add('<tr class="'.$sRowClass.'"><td><input type="checkbox" class="dbt-cbx" name="dbt-cbx[]" value="'.$sCurrentClass.'::'.$sCurrentId.'" /></td><td>'.$sFilename.'</td><td>'.$sRecordToClean.'</td><td>'.$sTargetLocation.'</td></tr>');
+			}
+
+			$oP->add('</table>');
+			$oP->add('<div><button type="submit" name="step_name" value="restore" disabled>'.Dict::S('DBTools:LostAttachments:Button:Restore').'</button></div>');
+
+			// JS to handle checkboxes and button
+			$oP->add_ready_script(
+<<<EOF
+	// Check all / none checkboxes
+	$('.dbt-lostattachments .dbt-toggler-cbx').on('click', function(){
+		$('.dbt-lostattachments .dbt-cbx').prop('checked', $(this).prop('checked'));
+		
+		// Disable restore button if at lest one checkbox clicked
+		var bDisableButton = ($('.dbt-lostattachments .dbt-cbx:checked').length === 0)
+		$('.dbt-lostattachments button[name="step_name"][value="restore"]').prop('disabled', bDisableButton);
+	});
+
+	// Click on a checkbox
+	$('.dbt-lostattachments .dbt-cbx').on('click', function(){
+		// Disable restore button if at lest one checkbox clicked
+		var bDisableButton = ($('.dbt-lostattachments .dbt-cbx:checked').length === 0)
+		$('.dbt-lostattachments button[name="step_name"][value="restore"]').prop('disabled', bDisableButton);
+		
+		// Uncheck global checkbox
+		if( $('.dbt-lostattachments .dbt-cbx:not(:checked)').length > 0 )
+		{
+			$('.dbt-lostattachments .dbt-toggler-cbx').prop('checked', false);
+		}
+	});
+EOF
+			);
+		}
+
+		$oP->add('</div>');
+	}
+
+	// Step 3: Restore results
+	if($bDoRestore)
+	{
+		$oP->add('<div class="dbt-step">');
+		$oP->add('<p class="dbt-step-description"><span class="dbt-step-number">3.</span><span>'.Dict::S('DBTools:LostAttachments:Step:RestoreResults').'</span></p>');
+
+		$oP->add('<div class="header_message message_info">'.Dict::Format('DBTools:LostAttachments:Step:RestoreResults:Results', $iRestoredItemsCount, $iRecordsToCleanCount).'</div>');
+
+		if(!empty($aErrorsReport))
+		{
+			foreach($aErrorsReport as $sErrorReport)
+			{
+				$oP->add('<div class="header_message message_error">'.$sErrorReport.'</div>');
+			}
+		}
+
+		$oP->add('</div>');
+	}
+
+	$oP->add($oAppContext->GetForForm());
+	$oP->add('</form>');
+	$oP->add('</div>');
+
+	$oP->add('</div>');
+	$oP->add('</div>');
+
+	// Buttons disabling on click
+	$sConfirmText = Dict::S('DBTools:LostAttachments:Button:Restore:Confirm');
+	$sButtonBusyText = Dict::S('DBTools:LostAttachments:Button:Busy');
+	$oP->add_ready_script(
+<<<EOF
+	$('.dbt-lostattachments button[name="step_name"]').on('click', function(){
+	
+		if($(this).val() === 'restore')
+		{
+			if(!confirm('{$sConfirmText}'))
+			{
+				return false;
+			}		
+		}
+		//$(this).prop('disabled', true);
+		$(this).text('{$sButtonBusyText}');
+	});
+EOF
+	);
+
+	return $oP;
+}
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+try
+{
+	if (method_exists('ApplicationMenu', 'CheckMenuIdEnabled'))
+	{
+		LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+		ApplicationMenu::CheckMenuIdEnabled('DBToolsMenu');
+	}
+	else
+	{
+		LoginWebPage::DoLogin(true); // Check user rights and prompt if needed
+	}
+
+	$oAppContext = new ApplicationContext();
+
+
+	$sPageTitle = Dict::S('DBTools:Title');
+	$sPageId = 'db-tools';
+
+	$oP = new iTopWebPage($sPageTitle);
+	$oP->add_saas('env-'.utils::GetCurrentEnvironment().'/combodo-db-tools/default.scss');
+
+	$oP->add(
+<<<EOF
+<div class="page_header">
+  	<h1>$sPageTitle</h1>
+</div>
+EOF
+	);
+	$oP->AddTabContainer('db-tools');
+	$oP->SetCurrentTabContainer('db-tools');
+
+	// Database Info
+	$oP = DisplayDatabaseInfo($oP, $oAppContext);
+
+	// DB Inconsistences
+	$oP = DisplayDBInconsistencies($oP, $oAppContext);
+
+	// Lost attachments
+	$oP = DisplayLostAttachments($oP, $oAppContext);
+}
+catch (Exception $e)
+{
+	$oP->p('<b>'.$e->getMessage().'</b>');
+}
+
+if (isset($oP))
+{
+	$oP->output();
+}
--- a/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools',
+	'DBTools:Class' => 'Klasse',
+	'DBTools:Title' => 'Datenbank-Pflege-Tools',
+	'DBTools:ErrorsFound' => 'Fehler gefunden',
+	'DBTools:Error' => 'Fehler',
+	'DBTools:Count' => 'Anzahl',
+	'DBTools:SQLquery' => 'SQL Query',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL Ergebnis',
+	'DBTools:NoError' => 'Die Datenbank ist OK',
+	'DBTools:HideIds' => 'Fehler',
+	'DBTools:ShowIds' => 'Fehler und Werte',
+	'DBTools:ShowReport' => 'Report',
+	'DBTools:IntegrityCheck' => 'Integritätscheck',
+	'DBTools:FetchCheck' => 'Fetch Check (dauert länger)',
+
+	'DBTools:Analyze' => 'Analysiere',
+	'DBTools:Details' => 'Details anzeigen',
+	'DBTools:ShowAll' => 'Alle Fehler anzeigen',
+
+	'DBTools:Inconsistencies' => 'Datenbank-Inkonsistenzen',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Verwaister Eintrag in `%1$s`, er sollte eine Entsprechung in Tabelle `%2$s` haben',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Ungültiger Externer Key %1$s (Spalte: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Fehlender Externer Key %1$s (Spalte: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Ungültiger Wert für %1$s (Spalte: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Manche Benutzerkonten haben keinerlei zugewiesenes Profi',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch-Count-Fehler in `%1$s`, %2$d Einträge geholt (fetched) / %3$d gezählt',
+));
+
+// Database Info
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'DBTools:DatabaseInfo' => 'Datenbank-Information',
+	'DBTools:Base' => 'Datenbank',
+	'DBTools:Size' => 'Größe',
+));
+
+// Lost attachments
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'DBTools:LostAttachments' => 'Verlorene Attachments',
+	'DBTools:LostAttachments:Disclaimer' => 'Hier können Sie Ihre Datenbank nach verlorenen oder falsch platzierten Attachments durchsuchen. Dies ist kein Recovery-Tool - es stellt keine gelöschten Daten wieder her.',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analysieren',
+	'DBTools:LostAttachments:Button:Restore' => 'Wiederherstellen',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Diese Aktion kann nicht rückgängig gemacht werden, bitte bestätigen Sie dass Sie die ausgewählten Dateien wiederherstellen möchten.',
+	'DBTools:LostAttachments:Button:Busy' => 'Bitte warten...',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'Suche zunächst nach verlorenen / falsch platzierten Attachments, mittels einer Analyse der Datenbank',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyseergebnisse:',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Toll! Alles scheint am richtigen Ort zu sein.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Manche Attachments scheinen am falschen Ort zu sein. Werfen Sie einen Blick auf die folgende Liste und wählen Sie diejenigen aus, die Sie gerne verschieben möchten.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Dateiname',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Derzeitiger Ort',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Verschieben nach...',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore-Ergebnisse:',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d Attachments wurden wiederhergestellt.',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Als Inline-Bild gespeichert',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" mit DB-Tools wiederhergestellt'
+));
--- a/datamodels/2.x/combodo-db-tools/default.css
+++ b/datamodels/2.x/combodo-db-tools/default.css
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+.db-tools-tab-content .dbt-lostattachments .dbt-steps .dbt-step {
+  margin-top: 30px;
+  /* This is to avoid long exception message on restore errors */
+}
+.db-tools-tab-content .dbt-lostattachments .dbt-steps .dbt-step .dbt-step-description {
+  padding: 0;
+  margin: 0px 0px 5px 0px;
+}
+.db-tools-tab-content .dbt-lostattachments .dbt-steps .dbt-step .dbt-step-number {
+  margin-right: 0.3em;
+}
+.db-tools-tab-content .dbt-lostattachments .dbt-steps .dbt-step .listResults tr > *:first-child {
+  text-align: center;
+}
+.db-tools-tab-content .dbt-lostattachments .dbt-steps .dbt-step .message_error {
+  max-height: 150px;
+  overflow-y: auto;
+}
--- a/datamodels/2.x/combodo-db-tools/default.scss
+++ b/datamodels/2.x/combodo-db-tools/default.scss
@@ -0,0 +1,48 @@
+/*!
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+.db-tools-tab-content{
+  .dbt-lostattachments{
+    .dbt-steps{
+      .dbt-step{
+        margin-top: 30px;
+
+        .dbt-step-description{
+          padding: 0;
+          margin: 0px 0px 5px 0px;
+        }
+
+        .dbt-step-number{
+          margin-right: 0.3em;
+        }
+
+        .listResults{
+          tr>*:first-child{
+            text-align: center;
+          }
+        }
+
+        /* This is to avoid long exception message on restore errors */
+        .message_error{
+          max-height: 150px;
+          overflow-y: auto;
+        }
+      }
+    }
+  }
+}
--- a/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+// Database inconsistencies
+Dict::Add('EN US', 'English', 'English', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools',
+	'DBTools:Class' => 'Class',
+	'DBTools:Title' => 'Database Maintenance Tools',
+	'DBTools:ErrorsFound' => 'Errors Found',
+	'DBTools:Error' => 'Error',
+	'DBTools:Count' => 'Count',
+	'DBTools:SQLquery' => 'SQL query',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)',
+	'DBTools:SQLresult' => 'SQL result',
+	'DBTools:NoError' => 'The database is OK',
+	'DBTools:HideIds' => 'Error List',
+	'DBTools:ShowIds' => 'Detailed view',
+	'DBTools:ShowReport' => 'Report',
+	'DBTools:IntegrityCheck' => 'Integrity check',
+	'DBTools:FetchCheck' => 'Fetch Check (long)',
+
+	'DBTools:Analyze' => 'Analyze',
+	'DBTools:Details' => 'Show Details',
+	'DBTools:ShowAll' => 'Show All Errors',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted',
+));
+
+// Database Info
+Dict::Add('EN US', 'English', 'English', array(
+	'DBTools:DatabaseInfo' => 'Database Information',
+	'DBTools:Base' => 'Base',
+	'DBTools:Size' => 'Size',
+));
+
+// Lost attachments
+Dict::Add('EN US', 'English', 'English', array(
+	'DBTools:LostAttachments' => 'Lost attachments',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools'
+));
--- a/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/fr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/fr.dict.combodo-db-tools.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+Dict::Add('FR FR', 'French', 'Français', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'Outils BDD',
+	'DBTools:Class' => 'Classe',
+	'DBTools:Title' => 'Outils maintenance base de données',
+	'DBTools:ErrorsFound' => 'Erreurs trouvées',
+	'DBTools:Error' => 'Erreur',
+	'DBTools:Count' => 'Nombre',
+	'DBTools:SQLquery' => 'Requête SQL',
+	'DBTools:FixitSQLquery' => 'Requête SQL pour nettoyer la base (indication)',
+	'DBTools:SQLresult' => 'Résultat SQL',
+	'DBTools:NoError' => 'La base de données est OK',
+	'DBTools:HideIds' => 'Erreurs',
+	'DBTools:ShowIds' => 'Détails des erreurs',
+	'DBTools:ShowReport' => 'Rapport',
+	'DBTools:IntegrityCheck' => 'Contrôle d\'intégrité',
+	'DBTools:FetchCheck' => 'Contrôle de récupération (long)',
+
+	'DBTools:Analyze' => 'Analyser',
+	'DBTools:Details' => 'Afficher détails',
+	'DBTools:ShowAll' => 'Afficher toutes les erreurs',
+
+	'DBTools:Inconsistencies' => 'Incohérences de base de données',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Enregistrement orphelin dans `%1$s`, il devrait avoir son équivalent dans la tableit  `%2$s`',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Clef externe invalide %1$s (colonne: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Clef externe manquante %1$s (colonne: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Valeur invalide pour %1$s (colonne: `%2$s.%3$s`)',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Certains comptes utilisateurs n\'ont aucun profile',
+	'DBAnalyzer-Fetch-Count-Error' => 'Erreur de récupération dans `%1$s`, %2$d enregistrements récupérés / %3$d comptés',
+));
+
+// Database Info
+Dict::Add('FR FR', 'French', 'Français', array(
+	'DBTools:DatabaseInfo' => 'Information Base de Données',
+	'DBTools:Base' => 'Base',
+	'DBTools:Size' => 'Taille',
+));
+
+// Lost attachments
+Dict::Add('FR FR', 'French', 'Français', array(
+	'DBTools:LostAttachments' => 'Pièces jointes perdues',
+	'DBTools:LostAttachments:Disclaimer' => 'Ici vous pouvez retrouver des pièces jointes perdues ou égarées dans votre base de données. Ceci n\'est PAS un outil de récupération des données, il ne récupère pas les données effacées.',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyser',
+	'DBTools:LostAttachments:Button:Restore' => 'Restaurer',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Cet action ne peut être annuler, veuillez confirmer que vous voulez restaurer les fichiers sélectionnés.',
+	'DBTools:LostAttachments:Button:Busy' => 'Patientez ...',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'Tout d\'abord, scannez la base de données à la recherche de pièces jointes perdues/égarées.',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Résultat de l\'analyse :',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Parfait ! Il semble que tout soit en ordre.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Certaines pièces jointes (%1$d) semblent être au mauvais endroit. Examinez la liste suivante et cochez celles que vous souhaitez déplacer.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nom de fichier',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Emplacement actuel',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Déplacer vers ...',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Résultats de la restauration :',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d pièces jointes ont été restaurées.',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stockée comme "InlineImage"',
+	'DBTools:LostAttachments:History' => 'Pièce jointe "%1$s" restaurée avec l\'outil de BDD'
+));
--- a/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'combodo-db-tools/1.0.7',
+	array(
+		// Identification
+		//
+		'label' => 'Database maintenance tools',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.combodo-db-tools.php',
+		),
+		'webservice' => array(),
+		'data.struct' => array(),
+		'data.sample' => array(),
+
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any
+
+		// Default settings
+		//
+		'settings' => array(),
+	)
+);
--- a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+// Database inconsistencies
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	// Dictionary entries go here
+	'Menu:DBToolsMenu' => 'DB Tools~~',
+	'DBTools:Class' => 'Class~~',
+	'DBTools:Title' => 'Database Maintenance Tools~~',
+	'DBTools:ErrorsFound' => 'Errors Found~~',
+	'DBTools:Error' => 'Error~~',
+	'DBTools:Count' => 'Count~~',
+	'DBTools:SQLquery' => 'SQL query~~',
+	'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
+	'DBTools:SQLresult' => 'SQL result~~',
+	'DBTools:NoError' => 'The database is OK~~',
+	'DBTools:HideIds' => 'Error List~~',
+	'DBTools:ShowIds' => 'Detailed view~~',
+	'DBTools:ShowReport' => 'Report~~',
+	'DBTools:IntegrityCheck' => 'Integrity check~~',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+
+	'DBTools:Analyze' => 'Analyze~~',
+	'DBTools:Details' => 'Show Details~~',
+	'DBTools:ShowAll' => 'Show All Errors~~',
+
+	'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+
+	'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
+	'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
+	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+));
+
+// Database Info
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'DBTools:DatabaseInfo' => 'Database Information~~',
+	'DBTools:Base' => 'Base~~',
+	'DBTools:Size' => 'Size~~',
+));
+
+// Lost attachments
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'DBTools:LostAttachments' => 'Lost attachments~~',
+	'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+
+	'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
+	'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
+	'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
+	'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+
+	'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+
+	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
+	'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+
+	'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
+	'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+
+	'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
+	'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+));
--- a/datamodels/2.x/exclude.txt
+++ b/datamodels/2.x/exclude.txt
@@ -0,0 +1,5 @@
+#
+# The following source files are not re-distributed with the "build" of the application
+# since they are used solely for constructing other files during the build process
+#
+combodo-db-tools
--- a/datamodels/2.x/itop-attachments/module.attachments.php
+++ b/datamodels/2.x/itop-attachments/module.attachments.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/2.5.2',
+	'itop-attachments/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/2.5.2',
+	'itop-backup/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/2.5.2',
+	'itop-bridge-virtualization-storage/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/2.5.2',
+	'itop-change-mgmt-itil/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/2.5.2',
+	'itop-change-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/2.5.2',
+	'itop-config-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-config/module.itop-config.php
+++ b/datamodels/2.x/itop-config/module.itop-config.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/2.5.2',
+	'itop-config/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
@@ -18,7 +18,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/2.5.2',
+	'itop-datacenter-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
@@ -25,7 +25,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/2.5.2',
+	'itop-endusers-devices/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
+++ b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/2.5.2', array(
+	'itop-full-itil/2.5.4', array(
 	// Identification
 	//
 		'label' => 'Bridge - Request management ITIL + Incident management ITIL',
--- a/datamodels/2.x/itop-hub-connector/launch.php
+++ b/datamodels/2.x/itop-hub-connector/launch.php
@@ -234,7 +234,7 @@ function MakeDataToPost($sTargetRoute)
 	if (MetaModel::GetConfig()->Get('demo_mode'))
 	{
 		// Don't expose such information in demo mode
-		$aDataToPost = array();
+		$aDataToPost = array('disabled' => true, 'reason' => 'demo_mode');
 	}
 	else
 	{
@@ -466,4 +466,4 @@ catch (Exception $e)
 		IssueLog::Error($e->getMessage());
 	}
 }
-	
+	
--- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
@@ -5,7 +5,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/2.5.2',
+	'itop-hub-connector/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/2.5.2',
+	'itop-incident-mgmt-itil/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/2.5.2',
+	'itop-knownerror-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/2.5.2', array(
+	'itop-portal-base/2.5.4', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
@@ -284,7 +284,8 @@ class UserProfileBrickController extends BrickController
 				$aFormData['error'] = $e->GetMessage();
 			}

-			$aFormData['picture_url'] = $oImage->GetDownloadURL(get_class($oCurContact), $oCurContact->GetKey(), $sPictureAttCode);
+			// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8
+			$aFormData['picture_url'] = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oCurContact), 'sObjectId' => $oCurContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400, 't' => time()));
 			$aFormData['validation'] = array(
 				'valid' => true,
 				'messages' => array()
--- a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
@@ -793,6 +793,21 @@ class ObjectFormManager extends FormManager
                        $oField->SetDisplayOpened(true);
                    }
 				}
+				// - BlobField
+				if (in_array(get_class($oField), array('Combodo\\iTop\\Form\\Field\\BlobField', 'Combodo\\iTop\\Form\\Field\\ImageField')))
+				{
+					//   - Overriding attributes to display
+					if ($this->oApp !== null)
+					{
+						// Override hardcoded URLs in ormDocument pointing to back office console
+						$sDisplayUrl = $this->oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($this->oObject), 'sObjectId' => $this->oObject->GetKey(), 'sObjectField' => $sAttCode, 'cache' => 86400));
+						$sDownloadUrl = $this->oApp['url_generator']->generate('p_object_document_download', array('sObjectClass' => get_class($this->oObject), 'sObjectId' => $this->oObject->GetKey(), 'sObjectField' => $sAttCode, 'cache' => 86400));
+						/** @var \Combodo\iTop\Form\Field\BlobField $oField */
+						$oField->SetDisplayUrl($sDisplayUrl)
+							->SetDownloadUrl($sDownloadUrl);
+					}
+				}
+
 			}
 			else
 			{
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
@@ -632,7 +632,10 @@ class ApplicationHelper
 				$oImage = $oContact->Get('picture');
 				if (is_object($oImage) && !$oImage->IsEmpty())
 				{
-					$sContactPhotoUrl = $oImage->GetDownloadURL(get_class($oContact), $oContact->GetKey(), 'picture');
+					// Note: At this stage of runtime, the UrlGenerator context is not properly initialized (lacks the baseurl among other things).
+					// The Context is set later by the RouterListener during an event, so we manually put the base url with utils::GetAbsoluteUrlExecPage()
+					// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8
+					$sContactPhotoUrl = utils::GetAbsoluteUrlExecPage().$oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oContact), 'sObjectId' => $oContact->GetKey(), 'sObjectField' => 'picture', 'cache' => 86400));
 				}
 				else
 				{
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/2.5.2', array(
+	'itop-portal/2.5.4', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',
--- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/2.5.2',
+	'itop-problem-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
+++ b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/2.5.2',
+	'itop-profiles-itil/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/2.5.2',
+	'itop-request-mgmt-itil/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/2.5.2',
+	'itop-request-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt-provider/2.5.2',
+	'itop-service-mgmt-provider/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt/2.5.2',
+	'itop-service-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
@@ -18,7 +18,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-sla-computation/2.5.2',
+	'itop-sla-computation/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	 'itop-storage-mgmt/2.5.2',
+	 'itop-storage-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__,
-	'itop-tickets/2.5.2',
+	'itop-tickets/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
+++ b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
@@ -16,7 +16,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-virtualization-mgmt/2.5.2',
+	'itop-virtualization-mgmt/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-welcome-itil/2.5.2',
+	'itop-welcome-itil/2.5.4',
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/version.xml
+++ b/datamodels/2.x/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <information>
-  <version>2.5.2</version>
+  <version>2.5.4</version>
 </information>
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -452,6 +452,10 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
        }
        else {
            // Modifying a newly added link - the structure should already be up to date
+			if (iUniqueId < 0)
+			{
+				iUniqueId = -iUniqueId;
+			}
            me.aAdded[iUniqueId]['attr_' + sFormPrefix + sAttCode] = value;
        }
 	};
--- a/pages/ajax.document.php
+++ b/pages/ajax.document.php
@@ -54,7 +54,7 @@ try
 	{
 		case 'download_document':
 			// Fixing security hole from bug N°1227, disabling by default attachment from legacy portal.
-			$sRequestedPortalId = ((MetaModel::GetConfig()->Get('disable_attachments_download_legacy_portal') === true) && ($sClass === 'Attachment')) ? 'backoffice' : null;
+			$sRequestedPortalId = (MetaModel::GetConfig()->Get('disable_attachments_download_legacy_portal') === true) ? 'backoffice' : null;
 			LoginWebPage::DoLoginEx($sRequestedPortalId, false);
 			$id = utils::ReadParam('id', '');
 			$sField = utils::ReadParam('field', '');
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -51,13 +51,29 @@ try
 	require_once(APPROOT.'/application/user.preferences.class.inc.php');

 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLoginEx(null /* any portal */, false);
+	$operation = utils::ReadParam('operation', '');
+
+	// Only allow export functions to portal users
+	switch ($operation)
+	{
+		case 'export_build':
+		case 'export_cancel':
+		case 'export_download':
+		case 'cke_img_upload':
+		case 'cke_upload_and_browse':
+		case 'cke_browse':
+			$sRequestedPortalId = null;
+			break;
+
+		default:
+			$sRequestedPortalId = (MetaModel::GetConfig()->Get('disable_attachments_download_legacy_portal') === true) ? 'backoffice' : null;
+	}
+	LoginWebPage::DoLoginEx($sRequestedPortalId, false);

 	$oPage = new ajax_page("");
 	$oPage->no_cache();


-	$operation = utils::ReadParam('operation', '');
 	$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
 	$sEncoding = utils::ReadParam('encoding', 'serialize');
 	$sClass = utils::ReadParam('class', 'MissingAjaxParam', false, 'class');
Author	SHA1	Message	Date
Molkobain	3dbbf296b8	Exclude combodo-db-tools module from packages by default	2020-01-22 09:10:54 +01:00
Stephen Abello	878c23892d	Update version number for 2.5.4	2020-01-20 15:59:08 +01:00
Stephen Abello	248dab9289	N°2633 - Security hardening	2020-01-20 15:46:04 +01:00
Molkobain	3347f400b8	Internal: Revert files deleted by mistake 🙈	2020-01-08 11:57:29 +01:00
Molkobain	6082308e20	Add combodo-db-tools/1.0.7 module as a default module	2020-01-08 11:40:35 +01:00
Pierre Goiffon	b3369c8b0e	Update version number for 2.5.3 beta	2019-07-02 14:54:36 +02:00
bruno DA SILVA	6c948873ff	N°2323.6 Fix regression introduced in previous commit	2019-06-26 15:38:42 +02:00
Molkobain	93099ea3c7	N°2323.5 Fix regression introduced in previous commit Could not upload images in HTML field anymore	2019-06-21 10:01:31 +02:00
Molkobain	2f9e050e2b	N°2323.4 Fix regression introduced in previous commit Current user picture was no longer displayed in the portal (cherry picked from commit `56b9eb6cf3`)	2019-06-20 17:52:26 +02:00
Eric	02c78d4044	N°2278 - Object-copier: Fix n:n link attributes set to default on copy (cherry picked from commit `6564d84a2f`)	2019-06-18 14:57:45 +02:00
Eric	5102b113ed	N°2323 - Fix calls to ajax endpoints (cherry picked from commit `c723d19e01`)	2019-06-18 10:45:50 +02:00
Eric	f1e4d94499	N°2323 - Fix calls to ajax endpoints for portal	2019-06-18 10:43:45 +02:00
OИUЯd da silva	23cf2b91f4	make demo_mode effect more expressive closes #71	2019-05-06 11:42:27 +02:00
Thomas Casteleyn	2858d13fd5	🐛 Fix default usage of iTopMutex when TLS is enabled See R-021467	2019-04-29 11:18:54 +02:00