Exclude combodo-db-tools module from packages by default

Could not upload images in HTML field anymore

.gitignore

@@ -1,36 +1,37 @@
 
-/toolkit/
-/conf/*
-/env-*/*
+# no slash at the end to handle also symlinks
+/toolkit
+/conf
+/env-*
 
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
 test/vendor/*
 
 # all datas but listing prevention
-data/*
-!data/.htaccess
-!data/index.php
-!data/web.config
+/data/**
+!/data/.htaccess
+!/data/index.php
+!/data/web.config
 
 # iTop extensions
-extensions/*
-!extensions/readme.txt
+/extensions/**
+!/extensions/readme.txt
 
 # all logs but listing prevention
-log/*
-!log/.htaccess
-!log/index.php
-!log/web.config
+/log/**
+!/log/.htaccess
+!/log/index.php
+!/log/web.config
 
 
 # Jetbrains
-.idea/**
-!.idea/encodings.xml
-!.idea/codeStyles
-!.idea/codeStyles/*
-!.idea/inspectionProfiles
-!.idea/inspectionProfiles/*
+/.idea/**
+!/.idea/encodings.xml
+!/.idea/codeStyles
+!/.idea/codeStyles/*
+!/.idea/inspectionProfiles
+!/.idea/inspectionProfiles/*
 
 
 

application/applicationextension.inc.php

@@ -817,6 +817,10 @@ class RestResult
 	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss 
 	 */
 	const UNSAFE = 12;
+	/**
+	 * Result: the request page number is not valid. It must be an integer greater than 0
+	 */
+	const INVALID_PAGE = 13;
 	/**
 	 * Result: the operation could not be performed, see the message for troubleshooting
 	 */
@@ -865,7 +869,8 @@ class RestUtils
 	 * 	 
 	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return void
+	 *
+	 * @return string
 	 * @throws Exception If the parameter is missing
 	 * @api
 	 */
@@ -910,7 +915,8 @@ class RestUtils
 	 *
 	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return void
+	 *
+	 * @return string
 	 * @throws Exception If the parameter is missing or the class is unknown
 	 * @api
 	 */
@@ -1079,10 +1085,13 @@ class RestUtils
 	 * 	 
 	 * @param string $sClass Name of the class
 	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
+	 * @param int $iLimit The limit of results to return
+	 * @param int $iOffset The offset of results to return
+	 *
 	 * @return DBObjectSet The search result set
 	 * @throws Exception If the input structure is not valid
 	 */
-	public static function GetObjectSetFromKey($sClass, $key)
+	public static function GetObjectSetFromKey($sClass, $key, $iLimit = 0, $iOffset = 0)
 	{
 		if (is_object($key))
 		{
@@ -1117,7 +1126,7 @@ class RestUtils
 		{
 			throw new Exception("Wrong format for key");
 		}
-		$oObjectSet = new DBObjectSet($oSearch);
+		$oObjectSet = new DBObjectSet($oSearch, array(), array(), null, $iLimit, $iOffset);
 		return $oObjectSet;
 	}
 

application/dashlet.class.inc.php

@@ -498,7 +498,7 @@ class DashletUnknown extends Dashlet
 
 		$oPage->add('<div class="dashlet-content">');
 
-		$oPage->add('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
+		$oPage->add('<div class="dashlet-ukn-image"><img src="'.utils::HtmlEntities($sIconUrl).'" /></div>');
 		$oPage->add('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
 
 		$oPage->add('</div>');
@@ -513,7 +513,7 @@ class DashletUnknown extends Dashlet
 
 		$oPage->add('<div class="dashlet-content">');
 
-		$oPage->add('<div class="dashlet-ukn-image"><img src="'.$sIconUrl.'" /></div>');
+		$oPage->add('<div class="dashlet-ukn-image"><img src="'.utils::HtmlEntities($sIconUrl).'" /></div>');
 		$oPage->add('<div class="dashlet-ukn-text">'.$sExplainText.'</div>');
 
 		$oPage->add('</div>');
@@ -623,7 +623,7 @@ class DashletProxy extends DashletUnknown
 
 		$oPage->add('<div class="dashlet-content">');
 
-		$oPage->add('<div class="dashlet-pxy-image"><img src="'.$sIconUrl.'" /></div>');
+		$oPage->add('<div class="dashlet-pxy-image"><img src="'.utils::HtmlEntities($sIconUrl).'" /></div>');
 		$oPage->add('<div class="dashlet-pxy-text">'.$sExplainText.'</div>');
 
 		$oPage->add('</div>');
@@ -1616,7 +1616,7 @@ class DashletHeaderStatic extends Dashlet
 		$oPage->add('<div class="dashlet-content">');
 		$oPage->add('<div class="main_header">');
 
-		$oPage->add('<img src="'.$sIconPath.'">');
+		$oPage->add('<img src="'.utils::HtmlEntities($sIconPath).'">');
 		$oPage->add('<h1>'.$this->oModelReflection->DictString($sTitle).'</h1>');
 
 		$oPage->add('</div>');
@@ -1748,7 +1748,7 @@ class DashletHeaderDynamic extends Dashlet
 		$oPage->add('<div class="dashlet-content">');
 		$oPage->add('<div class="main_header">');
 
-		$oPage->add('<img src="'.$sIconPath.'">');
+		$oPage->add('<img src="'.utils::HtmlEntities($sIconPath).'">');
 
 		$oFilter = DBObjectSearch::FromOQL($sQuery);
 		$oBlock = new DisplayBlock($oFilter, 'summary');
@@ -1776,7 +1776,7 @@ class DashletHeaderDynamic extends Dashlet
 		$oPage->add('<div class="dashlet-content">');
 		$oPage->add('<div class="main_header">');
 
-		$oPage->add('<img src="'.$sIconPath.'">');
+		$oPage->add('<img src="'.utils::HtmlEntities($sIconPath).'">');
 
 		$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
 
@@ -1971,7 +1971,7 @@ class DashletBadge extends Dashlet
 
 		$oPage->add('<div id="block_fake_'.$this->sId.'" class="display_block">');
 		$oPage->add('<p>');
-		$oPage->add('   <a class="actions"><img src="'.$sIconUrl.'" style="vertical-align:middle;float;left;margin-right:10px;border:0;">'.$sClassLabel.': 947</a>');
+		$oPage->add('   <a class="actions"><img src="'.utils::HtmlEntities($sIconUrl).'" style="vertical-align:middle;float;left;margin-right:10px;border:0;">'.$sClassLabel.': 947</a>');
 		$oPage->add('</p>');
 		$oPage->add('<p>');
 		$oPage->add('   <a>'.Dict::Format('UI:ClickToCreateNew', $sClassLabel).'</a>');

application/datatable.class.inc.php

@@ -431,7 +431,7 @@ EOF;
 						}
 						else
 						{
-							$aRow['form::select'] = "<input type=\"checkBox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+							$aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
 						}
 					}
 					foreach($aColumns[$sAlias] as $sAttCode => $aData)
@@ -565,7 +565,7 @@ EOF;
 <<<EOF
 var oTable = $('#{$this->iListId} table.listResults');
 oTable.tableHover();
-oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
+oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, table_id: '{$this->iListId}', columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
 EOF
 		);
 		if ($sFakeSortList != '')

application/loginwebpage.class.inc.php

@@ -704,6 +704,7 @@ EOF
 			{
 				// No rights to be here, redirect to the portal
 				header('Location: '.$ret);
+				die();
 			}
 		}
 	}
@@ -843,8 +844,8 @@ EOF
 		{
 			$sAuthUser = $_SESSION['auth_user'];
 			UserRights::Login($sAuthUser); // Set the user's language
-			$sOldPwd = utils::ReadPostedParam('old_pwd', '', false, 'raw_data');
-			$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
+			$sOldPwd = utils::ReadPostedParam('old_pwd', '', 'raw_data');
+			$sNewPwd = utils::ReadPostedParam('new_pwd', '', 'raw_data');
 			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
 			{
 				$oPage = self::NewLoginWebPage();

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,8 +384,7 @@ EOF
 
             if ($oCurrentLink->IsNew())
             {
-                $key = -($iAddedId++);
-	            $aAddedLinks[] = array('iAddedId' => -$key, 'iRemote' => $oCurrentLink->Get($this->m_sExtKeyToRemote));
+                $key = $iAddedId--;
             }
             else
             {
@@ -367,23 +393,7 @@ 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";
 		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";

application/utils.inc.php

@@ -62,11 +62,11 @@ class utils
 	{
 		if (!file_exists($sParamFile))
 		{
-			throw new Exception("Could not find the parameter file: '$sParamFile'");
+			throw new Exception("Could not find the parameter file: '".utils::HtmlEntities($sParamFile)."'");
 		}
 		if (!is_readable($sParamFile))
 		{
-			throw new Exception("Could not load parameter file: '$sParamFile'");
+			throw new Exception("Could not load parameter file: '".utils::HtmlEntities($sParamFile)."'");
 		}
 		$sParams = file_get_contents($sParamFile);
 
@@ -273,7 +273,18 @@ class utils
 		}
 		return $retValue;		
 	}
-	
+
+	/**
+	 * @param string|string[] $value
+	 * @param string $sSanitizationFilter one of : integer, class, string, context_param, parameter, field_name,
+	 *               transaction_id, parameter, raw_data
+	 *
+	 * @return string|string[]|bool boolean for :
+	 *   * the 'class' filter (true if valid, false otherwise)
+	 *   * if the filter fails (@see \filter_var())
+	 *
+	 * @since 2.5.2 2.6.0 new 'transaction_id' filter
+	 */
 	protected static function Sanitize_Internal($value, $sSanitizationFilter)
 	{
 		switch($sSanitizationFilter)
@@ -314,6 +325,14 @@ class utils
 			{
 				switch($sSanitizationFilter)
 				{
+					case 'transaction_id':
+						// same as parameter type but keep the dot character
+						// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
+						// it must be included at the regexp beginning otherwise you'll get an invalid character error
+						$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
+							array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
+						break;
+
 					case 'parameter':
 					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^([ A-Za-z0-9_=-]|%3D|%2B|%2F)*$/'))); // the '=', '%3D, '%2B', '%2F' characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
 					break;
@@ -706,9 +725,8 @@ class utils
 	}
 
     /**
-     * Returns the absolute URL to the application root path
-     * @return string The absolute URL to the application root, without the first slash
-     */                   
+     * @return string The absolute URL to the application, including host and path
+     */
 	static public function GetAbsoluteUrlAppRoot()
 	{
 		static $sUrl = null;
@@ -1135,7 +1153,7 @@ class utils
 		}
 	}
 	/**
-	 * Get target configuration file name (including full path)
+	 * @return string target configuration file name (including full path)
 	 */
 	public static function GetConfigFilePath($sEnvironment = null)
 	{
@@ -1145,6 +1163,17 @@ class utils
 		}
 		return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
 	}
+	/**
+	 * @return string target configuration file name (including relative path)
+	 */
+	public static function GetConfigFilePathRelative($sEnvironment = null)
+	{
+		if (is_null($sEnvironment))
+		{
+			$sEnvironment = self::GetCurrentEnvironment();
+		}
+		return "conf/".$sEnvironment.'/'.ITOP_CONFIG_FILE;
+	}
 
     /**
      * @return string the absolute URL to the modules root path

core/asynctask.class.inc.php

@@ -168,6 +168,7 @@ abstract class AsyncTask extends DBObject
 			$aConfig = $aRetries[get_class($this)];
 			$iMaxRetries = $aConfig['max_retries'];
 		}
+		return $iMaxRetries;
 	}
 
 	/**

core/bulkchange.class.inc.php

@@ -332,6 +332,18 @@ class BulkChange
 		return true;
 	}
 
+	/**
+	 * @param \DBObject $oTargetObj
+	 * @param array $aRowData
+	 * @param array $aErrors
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors)
 	{
 		$aResults = array();
@@ -477,7 +489,9 @@ class BulkChange
 			if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; }
 
 			$aReasons = array();
-			$iFlags = $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
+			$iFlags = ($oTargetObj->IsNew())
+				? $oTargetObj->GetInitialStateAttributeFlags($sAttCode, $aReasons)
+				: $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
 			if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
 			{
 					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Readonly', $sAttCode, $oTargetObj->Get($sAttCode), $aRowData[$iCol]);

core/displayablegraph.class.inc.php

@@ -1270,6 +1270,7 @@ class DisplayableGraph extends SimpleGraph
 
 		$oPdf->SetAutoPageBreak(true, $fBreakMargin);
 		$oPdf->SetAlpha(1);
+		$oPdf->SetTextColor(0, 0, 0);
 	}
 	
 	/**

core/email.class.inc.php

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

core/expressioncache.class.inc.php

@@ -78,6 +78,7 @@ EOF;
 }
 EOF;
 
+			SetupUtils::builddir(dirname($sFilePath));
 			file_put_contents($sFilePath, $content);
 		}
 	}

core/htmlsanitizer.class.inc.php

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

core/inlineimage.class.inc.php

@@ -27,6 +27,11 @@ define('INLINEIMAGE_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_i
 
 class InlineImage extends DBObject
 {
+	/** @var string attribute to be added to IMG tags to contain ID */
+	const DOM_ATTR_ID = 'data-img-id';
+	/** @var string attribute to be added to IMG tags to contain secret */
+	const DOM_ATTR_SECRET = 'data-img-secret';
+
 	public static function Init()
 	{
 		$aParams = array
@@ -208,7 +213,8 @@ class InlineImage extends DBObject
 		$aNeedles = array();
 		$aReplacements = array();
 		// Find img tags with an attribute data-img-id
-		if (preg_match_all('/<img ([^>]*)data-img-id="([0-9]+)"([^>]*)>/i', $sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if (preg_match_all('/<img ([^>]*)'.self::DOM_ATTR_ID.'="([0-9]+)"([^>]*)>/i',
+			$sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
 			$sUrl = utils::GetAbsoluteUrlAppRoot().INLINEIMAGE_DOWNLOAD_URL;
 			foreach($aMatches as $aImgInfo)
@@ -230,6 +236,42 @@ class InlineImage extends DBObject
 		return $sHtml;
 	}
 
+	/**
+	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
+	 * so that we can later reconstruct the full "src" URL when needed
+	 *
+	 * @param \DOMElement $oElement
+	 */
+	public static function ProcessImageTag(DOMElement $oElement)
+	{
+		$sSrc = $oElement->getAttribute('src');
+		$sDownloadUrl = str_replace(array('.', '?'), array('\.', '\?'), INLINEIMAGE_DOWNLOAD_URL); // Escape . and ?
+		$sUrlPattern = '|'.$sDownloadUrl.'([0-9]+)&s=([0-9a-f]+)|';
+		$bIsInlineImage = preg_match($sUrlPattern, $sSrc, $aMatches);
+		if (!$bIsInlineImage)
+		{
+			return;
+		}
+		$iInlineImageId = $aMatches[1];
+		$sInlineIMageSecret = $aMatches[2];
+
+		$sAppRoot = utils::GetAbsoluteUrlAppRoot();
+		$sAppRootPattern = '/^'.preg_quote($sAppRoot, '/').'/';
+		$bIsSameItop = preg_match($sAppRootPattern, $sSrc);
+		if (!$bIsSameItop)
+		{
+			// @see N°1921
+			// image from another iTop should be treated as external images
+			$oElement->removeAttribute(self::DOM_ATTR_ID);
+			$oElement->removeAttribute(self::DOM_ATTR_SECRET);
+
+			return;
+		}
+
+		$oElement->setAttribute(self::DOM_ATTR_ID, $iInlineImageId);
+		$oElement->setAttribute(self::DOM_ATTR_SECRET, $sInlineIMageSecret);
+	}
+
 	/**
 	 * Get the javascript fragment  - to be added to "on document ready" - to adjust (on the fly) the width on Inline Images
 	 */

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

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";
 	}
 

core/restservices.class.inc.php

@@ -257,13 +257,14 @@ class CoreServices implements iRestServiceProvider
 	 */
 	public function ListOperations($sVersion)
 	{
+		// 1.4 - iTop 2.5.2, 2.6.1, 2.7.0, Verb 'core/get': added pagination parameters limit and page
 		// 1.3 - iTop 2.2.0, Verb 'get_related': added the options 'redundancy' and 'direction' to take into account the redundancy in the impact analysis
 		// 1.2 - was documented in the wiki but never released ! Same as 1.3
 		// 1.1 - In the reply, objects have a 'key' entry so that it is no more necessary to split class::key programmaticaly
 		// 1.0 - Initial implementation in iTop 2.0.1
 		//
 		$aOps = array();
-		if (in_array($sVersion, array('1.0', '1.1', '1.2', '1.3'))) 
+		if (in_array($sVersion, array('1.0', '1.1', '1.2', '1.3', '1.4')))
 		{
 			$aOps[] = array(
 				'verb' => 'core/create',
@@ -299,9 +300,16 @@ class CoreServices implements iRestServiceProvider
 
 	/**
 	 * Enumerate services delivered by this class
+	 *
 	 * @param string $sVersion The version (e.g. 1.0) supported by the services
+	 * @param string $sVerb
+	 * @param $aParams
+	 *
 	 * @return RestResult The standardized result structure (at least a message)
-	 * @throws Exception in case of internal failure.	 
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \SimpleGraphException
+	 * @throws \Exception
 	 */
 	public function ExecOperation($sVersion, $sVerb, $aParams)
 	{
@@ -436,8 +444,10 @@ class CoreServices implements iRestServiceProvider
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
 			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
+			$iLimit = (int)RestUtils::GetOptionalParam($aParams, 'limit', 0);
+			$iPage = (int)RestUtils::GetOptionalParam($aParams, 'page', 1);
 
-			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
+			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key, $iLimit, self::getOffsetFromLimitAndPage($iLimit, $iPage));
 			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
 	
 			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ) != UR_ALLOWED_YES)
@@ -450,6 +460,11 @@ class CoreServices implements iRestServiceProvider
 				$oResult->code = RestResult::UNAUTHORIZED;
 				$oResult->message = "The current user does not have enough permissions for exporting data of class $sTargetClass";
 			}
+			elseif ($iPage < 1)
+            {
+			    $oResult->code = RestResult::INVALID_PAGE;
+			    $oResult->message = "The request page number is not valid. It must be an integer greater than 0";
+            }
 			else
 			{
 				while ($oObject = $oObjectSet->Fetch())
@@ -774,4 +789,15 @@ class CoreServices implements iRestServiceProvider
 			$oResult->message = $sRes;
 		}
 	}
+
+	/**
+	 * @param int $iLimit
+	 * @param int $iPage
+	 *
+	 * @return int Offset for a given page number
+	 */
+	protected static function getOffsetFromLimitAndPage($iLimit, $iPage)
+	{
+		return $iLimit * max(0, $iPage - 1);
+	}
 }

css/css-variables.scss

@@ -1,3 +1,6 @@
+// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
+$version: "v2.5.4";
+
 // Base colors
 $gray-base:              #000 !default;
 $gray-darker:            lighten($gray-base, 13.5%) !default; // #222
@@ -48,6 +51,3 @@ $search-add-criteria-box-hover-color: $gray-extra-light;
 $search-button-box-color: $combodo-orange;
 $search-button-box-bg-color: $white;
 $search-button-box-bg-hover-color: $gray-extra-light;
-
-// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.5.0";

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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0-beta) 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.0) 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.0) 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.0) 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.0") 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.0) 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.0);
+  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.0);
+  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.0) 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.0) 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.0) 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.0) 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.0) 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.0) 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.0) 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.0) 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.0);
+  background-image: url(../images/breadcrumb-separator.png?v=v2.5.4);
   background-repeat: no-repeat;
   width: 8px;
   height: 16px;

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';

datamodels/2.x/authent-external/cs.dict.authent-external.php

@@ -1,5 +1,4 @@
 <?php
-
 // Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
@@ -16,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data.
  *
@@ -26,7 +23,6 @@
  * @copyright   Copyright (C) 2010-2014 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -36,12 +32,14 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'Class:UserExternal' => 'Externí uživatel',
-    'Class:UserExternal+' => 'Uživatel definovaný mimo iTop',
+	'Class:UserExternal' => 'Externí uživatel',
+	'Class:UserExternal+' => 'Uživatel definovaný mimo iTop',
 ));
+
+
+
+?>

datamodels/2.x/authent-external/da.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,16 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Erik Bøg <erik@boegmoeller.dk>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserExternal' => 'Extern Bruger',
 	'Class:UserExternal+' => 'Bruger udenfor iTop',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-external/de.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,7 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /*
 * @author ITOMIG GmbH <martin.raenker@itomig.de>
 
@@ -23,9 +22,11 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 *		
 */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserExternal' => 'Externer Benutzer',
 	'Class:UserExternal+' => 'Benutzer außerhalb von iTop',
-	));
-?>
+));
+
+
+
+?>

datamodels/2.x/authent-external/es_cr.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,12 +31,14 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:UserExternal' => 'Usuario Externo',
 	'Class:UserExternal+' => 'Usuario Autenticado fuera de iTop',
 ));
+
+
+
+?>

datamodels/2.x/authent-external/fr.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,15 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserExternal' => 'Utilisateur externe à iTop',
 	'Class:UserExternal+' => 'Utilisateur authentifié à l\'extérieur d\'iTop',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-external/hu.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,15 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserExternal' => 'Külső felhasználó',
 	'Class:UserExternal+' => '',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-external/it.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,15 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -33,11 +30,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserExternal' => 'Esterno utente',
 	'Class:UserExternal+' => 'Utente autenticato al di fuori di iTop',

datamodels/2.x/authent-external/ja.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,16 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Hirofumi Kosaka <kosaka@rworks.jp>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserExternal' => '外部ユーザー',
 	'Class:UserExternal+' => '外部認証ユーザー',
 ));
-?>
+
+
+
+?>

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.0',
+	'authent-external/2.5.4',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-external/nl.dict.authent-external.php

@@ -0,0 +1,48 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:UserExternal' => 'External user~~',
+	'Class:UserExternal+' => 'User authentified outside of iTop~~',
+));
+
+
+
+?>

datamodels/2.x/authent-external/pt_br.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,15 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserExternal' => 'Usuário externo',
 	'Class:UserExternal+' => '',
 ));
+
+
+
 ?>

datamodels/2.x/authent-external/ru.dict.authent-external.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
  *
@@ -9,12 +8,14 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  *
  */
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserExternal' => 'Внешний пользователь',
 	'Class:UserExternal+' => 'Пользователь, аутентифицируемый вне iTop',
 ));
+
+
+
+?>

datamodels/2.x/authent-external/tr.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,8 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -35,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserExternal' => 'Harici kullanıcı',
 	'Class:UserExternal+' => 'iTop dışında yetki kontrolü yapılan kullanıcı',

datamodels/2.x/authent-external/zh_cn.dict.authent-external.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserExternal' => '外部用户',
 	'Class:UserExternal+' => '用户在 iTop 外部验证身份',

datamodels/2.x/authent-ldap/cs.dict.authent-ldap.php

@@ -1,5 +1,4 @@
 <?php
-
 // Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
@@ -16,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data.
  *
@@ -26,7 +23,6 @@
  * @copyright   Copyright (C) 2010-2014 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -36,14 +32,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'Class:UserLDAP' => 'LDAP uživatel',
-    'Class:UserLDAP+' => 'Uživatel ověřen přes LDAP',
-    'Class:UserLDAP/Attribute:password' => 'Heslo',
-    'Class:UserLDAP/Attribute:password+' => '',
+	'Class:UserLDAP' => 'LDAP uživatel',
+	'Class:UserLDAP+' => 'Uživatel ověřen přes LDAP',
+	'Class:UserLDAP/Attribute:password' => 'Heslo',
+	'Class:UserLDAP/Attribute:password+' => '',
 ));
+
+
+
+?>

datamodels/2.x/authent-ldap/da.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,18 +15,18 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Erik Bøg <erik@boegmoeller.dk>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLDAP' => 'LDAP-Bruger',
 	'Class:UserLDAP+' => 'Bruger der godkendes via LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Password',
 	'Class:UserLDAP/Attribute:password+' => 'Brugerens password',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-ldap/de.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,7 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /*
 * @author ITOMIG GmbH <martin.raenker@itomig.de>
 
@@ -23,11 +22,13 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 *		
 */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:UserLDAP' => 'LDAP-Benutzer',
-	'Class:UserLDAP+' => 'Benutzer, der über LDAP authentifiziert wird',
-	'Class:UserLDAP/Attribute:password' => 'Passwort',
-	'Class:UserLDAP/Attribute:password+' => 'Benutzerpasswort',
-	));
-?>
+	'Class:UserLDAP' => 'LDAP-Benutzer',
+	'Class:UserLDAP+' => 'Benutzer, der über LDAP authentifiziert wird',
+	'Class:UserLDAP/Attribute:password' => 'Passwort',
+	'Class:UserLDAP/Attribute:password+' => 'Benutzerpasswort',
+));
+
+
+
+?>

datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,14 +31,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-  'Class:UserLDAP' => 'Usuario LDAP',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario Autenticado vía LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Contraseña',
 	'Class:UserLDAP/Attribute:password+' => 'Contraseña',
 ));
+
+
+
+?>

datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLDAP' => 'Utilisateur LDAP',
 	'Class:UserLDAP+' => 'Utilisateur authentifié par un serveur LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Mot de passe LDAP',
 	'Class:UserLDAP/Attribute:password+' => '',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-ldap/hu.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
 	'Class:UserLDAP+' => '',
 	'Class:UserLDAP/Attribute:password' => 'Jelszó',
 	'Class:UserLDAP/Attribute:password+' => '',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-ldap/it.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,15 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -33,11 +30,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLDAP' => 'Utente LDAP',
 	'Class:UserLDAP+' => 'Utente autenticato da LDAP',

datamodels/2.x/authent-ldap/ja.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,18 +15,18 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Hirofumi Kosaka <kosaka@rworks.jp>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLDAP' => 'LDAP ユーザー',
 	'Class:UserLDAP+' => 'LDAP認証ユーザー',
 	'Class:UserLDAP/Attribute:password' => 'パスワード',
 	'Class:UserLDAP/Attribute:password+' => '認証文字列',
 ));
-?>
+
+
+
+?>

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.0',
+	'authent-ldap/2.5.4',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php

@@ -0,0 +1,50 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:UserLDAP' => 'LDAP user~~',
+	'Class:UserLDAP+' => 'User authentified by LDAP~~',
+	'Class:UserLDAP/Attribute:password' => 'Password~~',
+	'Class:UserLDAP/Attribute:password+' => 'user authentication string~~',
+));
+
+
+
+?>

datamodels/2.x/authent-ldap/pt_br.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLDAP' => 'Usuário externo via LDAP',
 	'Class:UserLDAP+' => '',
 	'Class:UserLDAP/Attribute:password' => 'Senha',
 	'Class:UserLDAP/Attribute:password+' => '',
 ));
+
+
+
 ?>

datamodels/2.x/authent-ldap/ru.dict.authent-ldap.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
  *
@@ -9,14 +8,16 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  *
  */
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Пароль',
 	'Class:UserLDAP/Attribute:password+' => 'Строка аутентификации пользователя',
-));
+));
+
+
+
+?>

datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLDAP' => 'LDAP kullanıcısı',
 	'Class:UserLDAP+' => 'Yetki kontrolü LDAP tarafından yapılan',

datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLDAP' => 'LDAP 用户',
 	'Class:UserLDAP+' => '用户由 LDAP 鉴别身份',

datamodels/2.x/authent-local/cs.dict.authent-local.php

@@ -1,5 +1,4 @@
 <?php
-
 // Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
@@ -16,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data.
  *
@@ -26,7 +23,6 @@
  * @copyright   Copyright (C) 2010-2014 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -36,14 +32,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'Class:UserLocal' => 'interní uživatel iTop',
-    'Class:UserLocal+' => 'Uživatel ověřen interně v iTop',
-    'Class:UserLocal/Attribute:password' => 'Heslo',
-    'Class:UserLocal/Attribute:password+' => '',
+	'Class:UserLocal' => 'interní uživatel iTop',
+	'Class:UserLocal+' => 'Uživatel ověřen interně v iTop',
+	'Class:UserLocal/Attribute:password' => 'Heslo',
+	'Class:UserLocal/Attribute:password+' => '',
 ));
+
+
+
+?>

datamodels/2.x/authent-local/da.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,18 +15,18 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Erik Bøg <erik@boegmoeller.dk>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:UserLocal' => 'iTop-Bruger',
 	'Class:UserLocal+' => 'Bruger der godkendes af iTop',
 	'Class:UserLocal/Attribute:password' => 'Password',
 	'Class:UserLocal/Attribute:password+' => 'Brugerens password',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-local/de.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,7 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /*
 * @author ITOMIG GmbH <martin.raenker@itomig.de>
 
@@ -23,11 +22,13 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 *		
 */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:UserLocal' => 'iTop-Benutzer',
-	'Class:UserLocal+' => 'Benutzer, von iTop authentifiziert',
-	'Class:UserLocal/Attribute:password' => 'Passwort',
-	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
-	));
-?>
+	'Class:UserLocal' => 'iTop-Benutzer',
+	'Class:UserLocal+' => 'Benutzer, von iTop authentifiziert',
+	'Class:UserLocal/Attribute:password' => 'Passwort',
+	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
+));
+
+
+
+?>

datamodels/2.x/authent-local/es_cr.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,14 +31,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:UserLocal' => 'Usuario de iTop',
 	'Class:UserLocal+' => 'Usuario Autenticado vía iTop',
 	'Class:UserLocal/Attribute:password' => 'Contraseña',
 	'Class:UserLocal/Attribute:password+' => 'Contraseña',
 ));
+
+
+
+?>

datamodels/2.x/authent-local/fr.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLocal' => 'Utilisateur iTop',
 	'Class:UserLocal+' => 'Utilisateur authentifié par iTop',
 	'Class:UserLocal/Attribute:password' => 'Mot de passe',
 	'Class:UserLocal/Attribute:password+' => '',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-local/hu.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal' => 'iTop felhasználó',
 	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
 	'Class:UserLocal/Attribute:password+' => '',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-local/it.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,15 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -33,11 +30,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:UserLocal' => 'Utente iTop',
 	'Class:UserLocal+' => 'Utente autenticato da iTop',

datamodels/2.x/authent-local/ja.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,18 +15,18 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Hirofumi Kosaka <kosaka@rworks.jp>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:UserLocal' => 'iTopユーザー',
 	'Class:UserLocal+' => 'iTopローカル認証ユーザー',
 	'Class:UserLocal/Attribute:password' => 'パスワード',
 	'Class:UserLocal/Attribute:password+' => '認証文字列',
 ));
-?>
+
+
+
+?>

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.0',
+	'authent-local/2.5.4',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/nl.dict.authent-local.php

@@ -0,0 +1,50 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:UserLocal' => 'iTop user~~',
+	'Class:UserLocal+' => 'User authentified by iTop~~',
+	'Class:UserLocal/Attribute:password' => 'Password~~',
+	'Class:UserLocal/Attribute:password+' => 'user authentication string~~',
+));
+
+
+
+?>

datamodels/2.x/authent-local/pt_br.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,16 +15,17 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLocal' => 'Usuário local',
 	'Class:UserLocal+' => '',
 	'Class:UserLocal/Attribute:password' => 'Senha',
 	'Class:UserLocal/Attribute:password+' => '',
 ));
+
+
+
 ?>

datamodels/2.x/authent-local/ru.dict.authent-local.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
  *
@@ -9,14 +8,16 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  *
  */
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLocal' => 'Пользователь iTop',
 	'Class:UserLocal+' => 'Пользователь, аутентифицируемый через iTop',
 	'Class:UserLocal/Attribute:password' => 'Пароль',
 	'Class:UserLocal/Attribute:password+' => 'Строка аутентификации пользователя',
-));
+));
+
+
+
+?>

datamodels/2.x/authent-local/tr.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:UserLocal' => 'iTop kullanıcısı',
 	'Class:UserLocal+' => 'Yetki kontorlünü iTop tarafından yapılan kullanıcı',

datamodels/2.x/authent-local/zh_cn.dict.authent-local.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,7 +22,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -34,11 +31,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:UserLocal' => 'iTop 用户',
 	'Class:UserLocal+' => '用户由 iTop 验证身份',

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~~'
+));

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~~'
+));

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>

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);
+	}
+}

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();
+}

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'
+));

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;
+}

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;
+        }
+      }
+    }
+  }
+}

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'
+));

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~~'
+));

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'
+));

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~~'
+));

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~~'
+));

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~~'
+));

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(),
+	)
+);

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~~'
+));

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~~'
+));

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~~'
+));

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~~'
+));

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~~'
+));

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

datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php

@@ -1,5 +1,4 @@
 <?php
-
 // Copyright (C) 2010-2012 Combodo SARL
 //
 //   This file is part of iTop.
@@ -16,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data.
  *
@@ -27,19 +24,38 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'Attachments:TabTitle_Count' => 'Přílohy (%1$d)',
-    'Attachments:EmptyTabTitle' => 'Přílohy',
-    'Attachments:FieldsetTitle' => 'Přílohy',
-    'Attachments:DeleteBtn' => 'Odstranit',
-    'Attachments:History_File_Added' => 'Příloha %1$s byla přidána.',
-    'Attachments:History_File_Removed' => 'Příloha %1$s byla odstraněna.',
-    'Attachments:AddAttachment' => 'Přidat přílohu: ',
-    'Attachments:UploadNotAllowedOnThisSystem' => 'Na tomto systému není povoleno nahrávání souborů.',
-    'Attachment:Max_Go' => '(Maximální velikost souboru: %1$s GiB)',
-    'Attachment:Max_Mo' => '(Maximální velikost souboru: %1$s MiB)',
-    'Attachment:Max_Ko' => '(Maximální velikost souboru: %1$s KiB)',
-    'Attachments:NoAttachment' => 'Žádná příloha. ',
-    'Attachments:PreviewNotAvailable' => 'Pro tento typ přílohy není náhled k dispozici.',
-    'Class:Attachment' => 'Příloha',
-    'Class:Attachment+' => 'Příloha',
+	'Attachments:TabTitle_Count' => 'Přílohy (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Přílohy',
+	'Attachments:FieldsetTitle' => 'Přílohy',
+	'Attachments:DeleteBtn' => 'Odstranit',
+	'Attachments:History_File_Added' => 'Příloha %1$s byla přidána.',
+	'Attachments:History_File_Removed' => 'Příloha %1$s byla odstraněna.',
+	'Attachments:AddAttachment' => 'Přidat přílohu: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Na tomto systému není povoleno nahrávání souborů.',
+	'Attachment:Max_Go' => '(Maximální velikost souboru: %1$s GiB)',
+	'Attachment:Max_Mo' => '(Maximální velikost souboru: %1$s MiB)',
+	'Attachment:Max_Ko' => '(Maximální velikost souboru: %1$s KiB)',
+	'Attachments:NoAttachment' => 'Žádná příloha. ',
+	'Attachments:PreviewNotAvailable' => 'Pro tento typ přílohy není náhled k dispozici.',
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
 ));

datamodels/2.x/itop-attachments/da.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,11 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @author	Erik Bøg <erik@boegmoeller.dk>
-
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Attachments:TabTitle_Count' => 'Vedhæftninger (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Vedhæftninger',
@@ -38,4 +35,24 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Attachments:NoAttachment' => 'Intet vedhæftet. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/de.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,7 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /*
 * @author ITOMIG GmbH <martin.raenker@itomig.de>
 
@@ -23,7 +22,6 @@
 * @licence	http://opensource.org/licenses/AGPL-3.0
 *		
 */
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Attachments:TabTitle_Count' => 'Attachments (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Attachments',
@@ -38,4 +36,25 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Attachment:Max_Ko' => '(Maximale Dateigröße: %1$s KB)',
 	'Attachments:NoAttachment' => 'Kein Attachment. ',
 	'Attachments:PreviewNotAvailable' => 'Vorschau für diesen Attachment-Typ nicht verfügbar.',
-	));
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/en.dict.itop-attachments.php

@@ -39,4 +39,24 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Attachments:NoAttachment' => 'No attachment. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Attachment' => 'Attachment',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
@@ -24,8 +22,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
  */
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Anexos',
 	'Attachments:FieldsetTitle' => 'Anexos',
@@ -38,7 +35,26 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Attachment:Max_Mo' => '(Tamaño Máximo de Archivo: %1$s Mb)',
 	'Attachment:Max_Ko' => '(Tamaño Máximo de Archivo: %1$s Kb)',
 	'Attachments:NoAttachment' => 'No hay Anexo. ',
-	'Class:Attachment' => 'Anexo',
-	'Class:Attachment+' => 'Anexo',
-  'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
-  ));
+	'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Attachments:TabTitle_Count' => 'Pièces jointes (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Pièces jointes',
@@ -38,4 +36,24 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Attachments:NoAttachment' => 'Aucune pièce jointe.',
 	'Attachments:PreviewNotAvailable' => 'Pas d\'aperçu pour ce type de pièce jointe.',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Attachments:TabTitle_Count' => 'Attachments (%1$d)~~',
+	'Attachments:EmptyTabTitle' => 'Attachments~~',
+	'Attachments:FieldsetTitle' => 'Attachments~~',
+	'Attachments:DeleteBtn' => 'Delete~~',
+	'Attachments:History_File_Added' => 'Attachment %1$s added.~~',
+	'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
+	'Attachments:AddAttachment' => 'Add attachment: ~~',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+	'Attachments:NoAttachment' => 'No attachment. ~~',
+	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/it.dict.itop-attachments.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Attachments:TabTitle_Count' => 'Attachments (%1$d)~~',
+	'Attachments:EmptyTabTitle' => 'Attachments~~',
+	'Attachments:FieldsetTitle' => 'Attachments~~',
+	'Attachments:DeleteBtn' => 'Delete~~',
+	'Attachments:History_File_Added' => 'Attachment %1$s added.~~',
+	'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
+	'Attachments:AddAttachment' => 'Add attachment: ~~',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+	'Attachments:NoAttachment' => 'No attachment. ~~',
+	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,12 +15,10 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
 /**
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Attachments:TabTitle_Count' => '添付 (%1$d)',
 	'Attachments:EmptyTabTitle' => '添付',
@@ -36,4 +34,24 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Attachments:NoAttachment' => '添付はありません。',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

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.0',
+	'itop-attachments/2.5.4',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,8 +15,6 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * @author	LinProfs <info@linprofs.com>
  * 
@@ -26,7 +24,6 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Attachments:TabTitle_Count' => 'Bijlagen (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Bijlagen',
@@ -41,8 +38,25 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Attachment:Max_Ko' => '(Maximum bestandsgrootte: %1$s Ko)',
 	'Attachments:NoAttachment' => 'Geen bijlage. ',
 	'Attachments:PreviewNotAvailable' => 'Een voorbeeld is niet beschikbaar voor dit type bijlage.',
-	'Class:Attachment' => 'Bijlage',
-	'Class:Attachment+' => '',
-		
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,15 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Anexos',
@@ -39,4 +36,24 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Attachments:NoAttachment' => 'Nenhum anexo. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
  *
@@ -9,7 +8,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  *
  */
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Attachments:TabTitle_Count' => 'Вложения (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Вложения',
@@ -25,3 +23,24 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Attachments:NoAttachment' => 'Нет вложений.',
 	'Attachments:PreviewNotAvailable' => 'Предварительный просмотр не доступен для этого типа вложений.',
 ));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php

@@ -0,0 +1,62 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Attachments:TabTitle_Count' => 'Attachments (%1$d)~~',
+	'Attachments:EmptyTabTitle' => 'Attachments~~',
+	'Attachments:FieldsetTitle' => 'Attachments~~',
+	'Attachments:DeleteBtn' => 'Delete~~',
+	'Attachments:History_File_Added' => 'Attachment %1$s added.~~',
+	'Attachments:History_File_Removed' => 'Attachment %1$s removed.~~',
+	'Attachments:AddAttachment' => 'Add attachment: ~~',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'File upload in NOT allowed on this system.~~',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s Go)~~',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s Mo)~~',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s Ko)~~',
+	'Attachments:NoAttachment' => 'No attachment. ~~',
+	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
+));
+
+//
+// Class: Attachment
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,15 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
  * Localized data
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
- 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:TabTitle_Count' => '附件 (%1$d)',
 	'Attachments:EmptyTabTitle' => '附件',
@@ -39,4 +36,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Attachments:NoAttachment' => '没有附件. ',
 	'Attachments:PreviewNotAvailable' => '该附件类型不支持预览.',
 ));
-?>
+
+//
+// Class: Attachment
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Attachment' => 'Attachment~~',
+	'Class:Attachment+' => '',
+	'Class:Attachment/Attribute:expire' => 'Expire~~',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Temp id~~',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Item class~~',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Item id~~',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Item org id~~',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contents~~',
+	'Class:Attachment/Attribute:contents+' => '',
+));

datamodels/2.x/itop-backup/ajax.backup.php

@@ -184,7 +184,15 @@ EOF
 			$sFile = utils::ReadParam('file', '', false, 'raw_data');
 			$oBackup = new DBBackupScheduled();
 			$sBackupDir = APPROOT.'data/backups/';
-			$oBackup->DownloadBackup($sBackupDir.$sFile);
+			$sPathNoDotDotPattern = "/^((?![\/\\\\]\.\.[\/\\\\]).)*$/";
+			if(preg_match($sPathNoDotDotPattern, $sBackupDir.$sFile) == 1)
+			{
+				$oBackup->DownloadBackup($sBackupDir.$sFile);
+			}
+			else
+			{
+				throw new InvalidParameterException('Invalid file path');
+			}
 			break;
 	}
 }

datamodels/2.x/itop-backup/cs.dict.itop-backup.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localized data.
  *
@@ -9,37 +8,40 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-    'bkp-backup-running' => 'Probíhá záloha. Vyčkejte prosím...',
-    'bkp-restore-running' => 'Probíhá obnova ze zálohy. Vyčkejte prosím...',
-    'Menu:BackupStatus' => 'Plánované zálohování',
-    'bkp-status-title' => 'Plánované zálohování',
-    'bkp-status-checks' => 'Nastavení testy',
-    'bkp-mysqldump-ok' => 'mysqldump nalezen: %1$s',
-    'bkp-mysqldump-notfound' => 'mysqldump nemohl být nalezen: %1$s - Ujistěte se prosím, že je nainstalován a v proměnné PATH, nebo upravte konfigurační soubor (položka mysql_bindir).',
-    'bkp-mysqldump-issue' => 'mysqldump nemohl být spuštěn (retcode=%1$d): Ujistěte se prosím, že je nainstalován a v proměnné PATH, nebo upravte konfigurační soubor (položka mysql_bindir).',
-    'bkp-missing-dir' => 'Cílová složka %1$s nebyla nalezena',
-    'bkp-free-disk-space' => '<b>%1$s volných</b> na %2$s',
-    'bkp-dir-not-writeable' => 'Nemohu zapisovat do adresáře %1$s',
-    'bkp-wrong-format-spec' => 'Současná specifikace názvu souboru nemůže být použita (%1$s). Bude nastavena výchozí: %2$s',
-    'bkp-name-sample' => 'Soubory zálohy jsou pojmenovány dle DB, data a času. Příklad: %1$s',
-    'bkp-week-days' => 'Záloha bude provedena <b>vždy v %1$s v %2$s</b>',
-    'bkp-retention' => 'V cílové složce <b>bude uchováno maximálně %1$d souborů záloh</b>.',
-    'bkp-next-to-delete' => 'Bude odstraněna při další záloze (nastavení "retention_count")',
-    'bkp-table-file' => 'Soubor',
-    'bkp-table-file+' => 'Pouze soubory s příponou .zip jsou považovány za soubory zálohy.',
-    'bkp-table-size' => 'Velikost',
-    'bkp-table-size+' => '',
-    'bkp-table-actions' => 'Akce',
-    'bkp-table-actions+' => '',
-    'bkp-status-backups-auto' => 'Automatické zálohy',
-    'bkp-status-backups-manual' => 'Manuální zálohy',
-    'bkp-status-backups-none' => 'Žádné zálohy',
-    'bkp-next-backup' => 'Další záloha bude provedena dne <b>%1$s</b> (%2$s) v %3$s',
-    'bkp-button-backup-now' => 'Zálohovat nyní!',
-    'bkp-button-restore-now' => 'Obnovit ze zálohy!',
-    'bkp-confirm-backup' => 'Potvrďte prosím, že chcete provést zálohu nyní.',
-    'bkp-confirm-restore' => 'Potvrďte prosím, že chcete obnovit ze zálohy %1$s.',
-    'bkp-wait-backup' => 'Vyčkejte prosím na dokončení zálohy...',
-    'bkp-wait-restore' => 'Vyčkejte prosím na dokončení obnovy',
-    'bkp-success-restore' => 'Obnova úspěšně dokončena.',
+
+	'bkp-backup-running' => 'Probíhá záloha. Vyčkejte prosím...',
+	'bkp-restore-running' => 'Probíhá obnova ze zálohy. Vyčkejte prosím...',
+
+	'Menu:BackupStatus' => 'Plánované zálohování',
+	'bkp-status-title' => 'Plánované zálohování',
+	'bkp-status-checks' => 'Nastavení testy',
+	'bkp-mysqldump-ok' => 'mysqldump nalezen: %1$s',
+	'bkp-mysqldump-notfound' => 'mysqldump nemohl být nalezen: %1$s - Ujistěte se prosím, že je nainstalován a v proměnné PATH, nebo upravte konfigurační soubor (položka mysql_bindir).',
+	'bkp-mysqldump-issue' => 'mysqldump nemohl být spuštěn (retcode=%1$d): Ujistěte se prosím, že je nainstalován a v proměnné PATH, nebo upravte konfigurační soubor (položka mysql_bindir).',
+	'bkp-missing-dir' => 'Cílová složka %1$s nebyla nalezena',
+	'bkp-free-disk-space' => '<b>%1$s volných</b> na %2$s',
+	'bkp-dir-not-writeable' => 'Nemohu zapisovat do adresáře %1$s',
+	'bkp-wrong-format-spec' => 'Současná specifikace názvu souboru nemůže být použita (%1$s). Bude nastavena výchozí: %2$s',
+	'bkp-name-sample' => 'Soubory zálohy jsou pojmenovány dle DB, data a času. Příklad: %1$s',
+	'bkp-week-days' => 'Záloha bude provedena <b>vždy v %1$s v %2$s</b>',
+	'bkp-retention' => 'V cílové složce <b>bude uchováno maximálně %1$d souborů záloh</b>.',
+	'bkp-next-to-delete' => 'Bude odstraněna při další záloze (nastavení "retention_count")',
+	'bkp-table-file' => 'Soubor', 
+	'bkp-table-file+' => 'Pouze soubory s příponou .zip jsou považovány za soubory zálohy.',
+	'bkp-table-size' => 'Velikost',
+	'bkp-table-size+' => '',
+	'bkp-table-actions' => 'Akce',
+	'bkp-table-actions+' => '',
+	'bkp-status-backups-auto' => 'Automatické zálohy',
+	'bkp-status-backups-manual' => 'Manuální zálohy',
+	'bkp-status-backups-none' => 'Žádné zálohy',
+	'bkp-next-backup' => 'Další záloha bude provedena dne <b>%1$s</b> (%2$s) v %3$s',
+	'bkp-button-backup-now' => 'Zálohovat nyní!',
+	'bkp-button-restore-now' => 'Obnovit ze zálohy!',
+	'bkp-confirm-backup' => 'Potvrďte prosím, že chcete provést zálohu nyní.',
+	'bkp-confirm-restore' => 'Potvrďte prosím, že chcete obnovit ze zálohy %1$s.',
+	'bkp-wait-backup' => 'Vyčkejte prosím na dokončení zálohy...',
+	'bkp-wait-restore' => 'Vyčkejte prosím na dokončení obnovy',
+	'bkp-success-restore' => 'Obnova úspěšně dokončena.',
 ));
+?>