Merge branch 'develop' into feature/7063

# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
#	symfony/config/services.yaml

README.md

@@ -107,10 +107,12 @@ We would like to give a special thank you 🤗 to the people from the community
 - Roháč, Richard (a.k.a [@RohacRichard](https://github.com/RohacRichard))
 - Rosenke, Stephan
 - Rudner, Björn (a.k.a [@rudnerbjoern](https://github.com/rudnerbjoern))
+- Šafránek, Jaroslav (a.k.a [jkcinik](https://sourceforge.net/u/jkcinik/profile/) on SourceForge)
 - Seki, Shoji
 - Shilov, Vladimir
 - Stetina, Pavel (a.k.a [@Stetinac](https://github.com/Stetinac))
 - Stukalov, Ilya (a.k.a [@ilya](https://www.github.com/ilya)-stukalov)
+- Tarjányi, Csaba (a.k.a [@tacsaby](https://github.com/tacsaby))
 - Tulio, Marco
 - Turrubiates, Miguel
 

addons/userrights/userrightsprofile.class.inc.php

@@ -4,6 +4,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 

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

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 

addons/userrights/userrightsprojection.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('ADMIN_PROFILE_ID', 1);
 
 class UserRightsBaseClass extends cmdbAbstractObject

application/ajaxwebpage.class.inc.php

@@ -7,6 +7,7 @@
 
 // cannot notify depreciation for now as this is still load in autoloader
 //DeprecatedCallsLog::NotifyDeprecatedFile('moved to sources/Application/WebPage/AjaxPage.php, now loadable using autoloader');
+use Combodo\iTop\Application\WebPage\AjaxPage;
 
 /**
  * Class ajax_page

application/applicationextension.inc.php

@@ -19,6 +19,8 @@
  */
 
 use Combodo\iTop\Application\UI\Base\iUIBlock;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Symfony\Component\DependencyInjection\Container;
 
 require_once(APPROOT.'application/newsroomprovider.class.inc.php');
@@ -270,14 +272,14 @@ interface iPreferencesExtension
 {
 	/**
 	 * @api
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 */
 	public function DisplayPreferences(WebPage $oPage);
 
 	/**
 	 * @api
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sOperation
 	 *
 	 * @return bool true if the operation has been used

application/cmdbabstract.class.inc.php

@@ -42,6 +42,9 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetViewTable;
 use Combodo\iTop\Application\UI\Links\Set\LinkSetUIBlockFactory;
+use Combodo\iTop\Application\WebPage\AjaxPage;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
@@ -285,7 +288,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \cmdbAbstractObject $oObj
 	 * @param array $aParams
 	 *
@@ -354,7 +357,7 @@ JS
 	 * @param int $iKey The identifier of the object
 	 * @param string $sMessageId Your id or one of the well-known ids: 'create', 'update' and 'apply_stimulus'
 	 * @param string $sMessage The HTML message (must be correctly escaped)
-	 * @param string $sSeverity Any of the \WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
+	 * @param string $sSeverity Any of the WebPage::ENUM_SESSION_MESSAGE_SEVERITY_XXX constants
 	 * @param float $fRank Ordering of the message: smallest displayed first (can be negative)
 	 * @param bool $bMustNotExist Do not alter any existing message (considering the id)
 	 *
@@ -376,7 +379,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
+	 * @param WebPage $oPage Warning, since 3.0.0 this parameter was kept for compatibility reason. You shouldn't write directly on the page!
 	 *   When writing to the page, markup will be put above the real header of the panel.
 	 *   To insert something IN the panel, we now need to add UIBlocks in either the "subtitle" or "toolbar" sections of the array that will be returned.
 	 * @param bool $bEditMode Deprecated parameter in iTop 3.0.0, use {@see GetDisplayMode()} and ENUM_DISPLAY_MODE_* constants instead
@@ -554,7 +557,7 @@ HTML
 	/**
 	 * Display properties tab of an object
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -593,7 +596,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @throws \Exception
@@ -634,7 +637,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 *
 	 * @throws \CoreException
@@ -861,7 +864,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method. Use {@see static::$sDisplayMode} instead
 	 * @param string $sPrefix
 	 * @param array $aExtraParams
@@ -1065,7 +1068,7 @@ HTML
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode Note that this parameter is no longer used in this method, {@see static::$sDisplayMode} is used instead, but we cannot remove it as it part of the base interface (iDisplay)...
 	 *
 	 * @throws \ApplicationException
@@ -1112,7 +1115,7 @@ HTML
 		}
 
 		// Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage.
-		/** @var \iTopWebPage $oPage */
+		/** @var iTopWebPage $oPage */
 		$aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode);
 		if (false === empty($aHeadersBlocks['subtitle'])) {
 			$oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']);
@@ -1147,7 +1150,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1170,7 +1173,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams See possible values in {@see DataTableUIBlockFactory::RenderDataTable()}
 	 *
@@ -1232,7 +1235,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \DBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -1404,7 +1407,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams key used :
 	 *      <ul>
@@ -1527,7 +1530,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 * @param string $sCharset
@@ -1686,7 +1689,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1899,7 +1902,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aParams
 	 *
@@ -1977,7 +1980,7 @@ HTML
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
 	 * @param array $aExtraParams
 	 *
@@ -2008,7 +2011,7 @@ HTML
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sClass
 	 * @param string $sAttCode
 	 * @param \AttributeDefinition $oAttDef
@@ -2746,7 +2749,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ArchivedObjectException
@@ -3151,7 +3154,7 @@ EOF
 	/**
 	 *  Select the derived class to create
 	 * @param string $sClass
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param \ApplicationContext $oAppContext
 	 * @param array $aPossibleClasses
 	 * @param array $aHiddenFields
@@ -3246,7 +3249,7 @@ EOF
 		return $oBlock;
 	}
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sClass
 	 * @param \DBObject|null $oSourceObject Object to use for the creation form, can be either the class to instantiate, an object to clone or an object to use (eg. already prefilled / modeled object)
 	 * @param array $aArgs
@@ -3331,7 +3334,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage      $oPage
+	 * @param WebPage      $oPage
 	 * @param string        $sStimulus
 	 * @param array|null    $aPrefillFormParam
 	 * @param bool          $bDisplayBareProperties Whether to display the object details or not
@@ -3709,7 +3712,7 @@ HTML;
 			if ($oAttDef->GetEditClass() == 'Document') {
 				/** @var \ormDocument $oDocument */
 				$oDocument = $this->Get($sAttCode);
-				if (!$oDocument->IsEmpty()) {
+				if (is_object($oDocument) && !$oDocument->IsEmpty()) {
 					$sFieldAsHtml = $this->GetAsHTML($sAttCode);
 
 					$sDisplayLabel = Dict::S('UI:OpenDocumentInNewWindow_');
@@ -3744,7 +3747,7 @@ HTML;
 	/**
 	 * Displays a blob document *inline* (if possible, depending on the type of the document)
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sAttCode
 	 *
 	 * @return string
@@ -4591,6 +4594,7 @@ HTML;
 	public function DBUpdate()
 	{
 		$this->LogCRUDEnter(__METHOD__);
+		$res = 0;
 
 		try {
 			if (count($this->ListChanges()) === 0) {
@@ -4651,6 +4655,7 @@ HTML;
 			if (static::IsCrudStackEmpty()) {
 				// Avoid signaling the current object that links were modified
 				static::RemoveObjectAwaitingEventDbLinksChanged(get_class($this), $this->GetKey());
+				$this->LogCRUDDebug(__METHOD__, var_export(self::$aObjectsAwaitingEventDbLinksChanged, true));
 				static::FireEventDbLinksChangedForAllObjects();
 			}
 		}
@@ -4659,6 +4664,11 @@ HTML;
 		return $oDeletionPlan;
 	}
 
+	protected function PostDeleteActions(): void
+	{
+		parent::PostDeleteActions();
+	}
+
 	/**
 	 * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future
 	 */
@@ -4825,7 +4835,7 @@ HTML;
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -4929,7 +4939,7 @@ HTML
 	/**
 	 * Special display where the case log uses the whole "screen" at the bottom of the "Properties" tab
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sComment
 	 * @param string $sPrefix
@@ -5054,7 +5064,7 @@ HTML
 	 * Display a form for modifying several objects at once
 	 * The form will be submitted to the current page, with the specified additional values
 	 *
-	 * @param \iTopWebPage $oP
+	 * @param iTopWebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5298,7 +5308,7 @@ EOF
 	/**
 	 * Process the reply made from a form built with DisplayBulkModifyForm
 	 *
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param string $sClass
 	 * @param array $aSelectedObj
 	 * @param string $sCustomOperation
@@ -5438,7 +5448,7 @@ EOF
 	/**
 	 * Perform all the needed checks to delete one (or more) objects
 	 *
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sClass
 	 * @param \DBObject[] $aObjects
 	 * @param $bPreview
@@ -5944,6 +5954,16 @@ JS
 		$this->FireEvent(EVENT_DB_CHECK_TO_DELETE, ['deletion_plan' => $oDeletionPlan]);
 	}
 
+	/**
+	 * @return void
+	 * @throws \CoreException
+	 * @since 3.1.2
+	 */
+	final protected function FireEventAboutToDelete(): void
+	{
+		$this->FireEvent(EVENT_DB_ABOUT_TO_DELETE);
+	}
+
 	/**
 	 * @return void
 	 * @throws \CoreException
@@ -5953,7 +5973,6 @@ JS
 	final protected function FireEventAfterDelete(): void
 	{
 		$this->NotifyAttachedObjectsOnLinkClassModification();
-		$this->FireEventDbLinksChangedForCurrentObject();
 		$this->FireEvent(EVENT_DB_AFTER_DELETE);
 	}
 
@@ -5986,13 +6005,16 @@ JS
 			}
 
 			$sTargetObjectId = $this->Get($sExternalKeyAttCode);
+			$sTargetClass = $oAttDef->GetTargetClass();
 			if ($sTargetObjectId > 0) {
-				self::RegisterObjectAwaitingEventDbLinksChanged($oAttDef->GetTargetClass(), $sTargetObjectId);
+				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sTargetObjectId for DBLINKS_CHANGED");
+				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sTargetObjectId);
 			}
 
 			$sPreviousTargetObjectId = $aPreviousValues[$sExternalKeyAttCode] ?? 0;
 			if ($sPreviousTargetObjectId > 0) {
-				self::RegisterObjectAwaitingEventDbLinksChanged($oAttDef->GetTargetClass(), $sPreviousTargetObjectId);
+				$this->LogCRUDDebug(__METHOD__, "Add $sTargetClass:$sPreviousTargetObjectId for DBLINKS_CHANGED");
+				self::RegisterObjectAwaitingEventDbLinksChanged($sTargetClass, $sPreviousTargetObjectId);
 			}
 		}
 	}
@@ -6042,7 +6064,12 @@ JS
 
 		$sClass = get_class($this);
 		$sId = $this->GetKey();
-		self::FireEventDbLinksChangedForClassId($sClass, $sId);
+		$bIsObjectAwaitingEventDbLinksChanged = self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+		if (false === $bIsObjectAwaitingEventDbLinksChanged) {
+			return;
+		}
+		self::FireEventDbLinksChangedForObject($this);
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 	}
 
 	/**
@@ -6074,9 +6101,15 @@ JS
 		// We want to avoid launching the listener twice, first here, and secondly after saving the Ticket in the listener
 		// By disabling the event to be fired, we can remove the current object from the attribute !
 		$oObject = MetaModel::GetObject($sClass, $sId, false);
+		self::FireEventDbLinksChangedForObject($oObject);
+		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
+	}
+
+	private static function FireEventDbLinksChangedForObject(DBObject $oObject)
+	{
+		self::SetEventDBLinksChangedBlocked(true);
 		// N°6408 The object can have been deleted
 		if (!is_null($oObject)) {
-			self::SetEventDBLinksChangedBlocked(true);
 			MetaModel::StartReentranceProtection($oObject);
 			$oObject->FireEvent(EVENT_DB_LINKS_CHANGED);
 			MetaModel::StopReentranceProtection($oObject);
@@ -6084,7 +6117,6 @@ JS
 				$oObject->DBUpdate();
 			}
 		}
-		self::RemoveObjectAwaitingEventDbLinksChanged($sClass, $sId);
 		cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
 	}
 

application/dashboard.class.inc.php

@@ -9,6 +9,8 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/dashboardlayout.class.inc.php');
 require_once(APPROOT.'application/dashlet.class.inc.php');
@@ -422,7 +424,7 @@ abstract class Dashboard
 	}
 
 	/**
-	 * @param \WebPage $oPage *
+	 * @param WebPage $oPage *
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ReflectionException
@@ -513,7 +515,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 * @param bool $bCanEdit
@@ -569,7 +571,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ReflectionException
 	 * @throws \Exception
@@ -592,7 +594,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 */
 	public function RenderDashletsProperties(WebPage $oPage, $aExtraParams = array())
@@ -1109,7 +1111,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \Exception
@@ -1228,7 +1230,7 @@ EOF
 
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @param array $aExtraParams
 	 *
@@ -1488,7 +1490,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sOQL
 	 *
 	 * @throws \DictExceptionMissingString

application/dashboardlayout.class.inc.php

@@ -19,6 +19,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Dashboard presentation
@@ -106,7 +107,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aCells
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams

application/dashlet.class.inc.php

@@ -23,6 +23,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\UIBlock;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/forms.class.inc.php');
 
@@ -222,7 +223,7 @@ abstract class Dashlet
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param bool $bEnclosingDiv
 	 * @param array $aExtraParams
@@ -298,7 +299,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *
@@ -309,7 +310,7 @@ EOF
 	/**
 	 * Rendering without the real data
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 * @param array $aExtraParams
 	 *

application/datamodel.application.xml

@@ -270,6 +270,23 @@
         </event_datum>
       </event_data>
     </event>
+    <event id="EVENT_DB_ABOUT_TO_DELETE" _delta="define">
+      <description>An object is about to be deleted from the database</description>
+      <sources>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
+      </sources>
+      <replaces>cmdbAbstractObject::OnDelete</replaces>
+      <event_data>
+        <event_datum id="object">
+          <description>The object about to be deleted</description>
+          <type>DBObject</type>
+        </event_datum>
+        <event_datum id="debug_info">
+          <description>Debug string</description>
+          <type>string</type>
+        </event_datum>
+      </event_data>
+    </event>
     <event id="EVENT_DB_AFTER_DELETE" _delta="define">
       <description>An object has been deleted into the database</description>
       <sources>

application/datatable.class.inc.php

@@ -1,5 +1,7 @@
 <?php
 
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**
@@ -61,8 +63,8 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
-	 * @param \DataTableSettings $oSettings
+	 * @param WebPage $oPage
+	 * @param DataTableSettings $oSettings
 	 * @param $bActionsMenu
 	 * @param $sSelectMode
 	 * @param $bViewLink
@@ -141,7 +143,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -236,7 +238,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $sSelectMode
 	 *
 	 * @return string
@@ -255,7 +257,7 @@ class DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -348,7 +350,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -375,7 +377,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aExtraParams
 	 *
 	 * @return string
@@ -405,7 +407,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $bViewLink
 	 * @param $iDefaultPageSize
@@ -658,7 +660,7 @@ EOF;
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize
@@ -790,7 +792,7 @@ JS
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iDefaultPageSize
 	 * @param $iStart
 	 */
@@ -818,7 +820,7 @@ JS
 class PrintableDataTable extends DataTable
 {
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $iPageSize
 	 * @param $iDefaultPageSize
 	 * @param $iPageIndex
@@ -844,7 +846,7 @@ class PrintableDataTable extends DataTable
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param $aColumns
 	 * @param $sSelectMode
 	 * @param $iPageSize

application/displayblock.class.inc.php

@@ -24,6 +24,8 @@ use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars\BlockChartAjaxBa
 use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie\BlockChartAjaxPie;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockCsv\BlockCsv;
 use Combodo\iTop\Application\UI\DisplayBlock\BlockList\BlockList;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Router\Router;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -595,7 +597,7 @@ class DisplayBlock
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @throws \ApplicationException
@@ -1354,7 +1356,7 @@ JS
 }
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\iUIBlock
@@ -1378,7 +1380,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \ConfigException
@@ -1456,7 +1458,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock
 	 * @throws \ApplicationException
@@ -1564,7 +1566,7 @@ JS
 	/**
 	 * @deprecated 3.1.0 N°5957
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Component\Html\Html|\Combodo\iTop\Application\UI\Base\Layout\UIContentBlock|string
@@ -1664,7 +1666,7 @@ JS
 
 	/**
 	 * @param array $aExtraParams
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 *
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
@@ -1830,7 +1832,7 @@ class MenuBlock extends DisplayBlock
 	 * an object in with the same tab active by default as the tab that was active when selecting
 	 * the "Modify..." action.
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @param string|null $sId
 	 *

application/excelexporter.class.inc.php

@@ -1,4 +1,8 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\CLIPage;
+use Combodo\iTop\Application\WebPage\Page;
+
 require_once('xlsxwriter.class.php');
 
 class ExcelExporter

application/forms.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Helper class to build interactive forms to be used either in stand-alone
@@ -828,7 +829,7 @@ class DesignerFormField
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param string $sFormId
 	 * @param string $sRenderMode
 	 *

application/logindefault.class.inc.php

@@ -119,6 +119,11 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	protected function OnConnected(&$iErrorCode)
 	{
 		Session::Unset('login_temp_auth_user');
+		if (is_null(UserRights::GetUserObject())){
+			//N°7085 avoid infinite loop
+			IssueLog::Error("No user logged in. exit");
+			exit(-1);
+		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
 
@@ -134,4 +139,4 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 			}
 		}
 	}
-}
+}

application/loginform.class.inc.php

@@ -140,7 +140,11 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 		$oLoginContext->AddBlockExtension('login_form_footer', new LoginBlockExtension('extensionblock/loginformfooter.html.twig'));
 
 		$bEnableResetPassword = MetaModel::GetConfig()->Get('forgot_password');
-		$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		$sResetPasswordUrl = MetaModel::GetConfig()->Get('forgot_password.url');
+		if ($sResetPasswordUrl == '')
+		{
+			$sResetPasswordUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		}
 		$aData = array(
 			'bEnableResetPassword' => $bEnableResetPassword,
 			'sResetPasswordUrl' => $sResetPasswordUrl,

application/logintwig.class.inc.php

@@ -9,6 +9,7 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\TwigBase\Twig\Extension;
+use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Twig\Environment;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\FilesystemLoader;

application/loginwebpage.class.inc.php

@@ -26,6 +26,8 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\WebPage\ErrorPage;
+use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 
@@ -90,7 +92,7 @@ class LoginWebPage extends NiceWebPage
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
 		$this->no_cache();
-		$this->add_xframe_options();
+		$this->add_http_headers();
 	}
 	
 	public function SetStyleSheet()

application/maintenancemsg.php

@@ -22,6 +22,7 @@
 // Maintenance message display functions
 // Only included by approot.inc.php
 //
+use Combodo\iTop\Application\WebPage\ErrorPage;
 
 /**
  * Use a setup page to display the maintenance message

application/menunode.class.inc.php

@@ -5,6 +5,9 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\WebPage\ErrorPage;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/application/template.class.inc.php');
@@ -345,7 +348,7 @@ class ApplicationMenu
 
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aExtraParams
 	 * @throws DictExceptionMissingString
 	 *
@@ -419,7 +422,7 @@ EOF
 	/**
 	 * Handles the display of the sub-menus (called recursively if necessary)
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param array $aMenus
 	 * @param array $aExtraParams
 	 * @param int $iActiveMenu

application/query.class.inc.php

@@ -21,6 +21,7 @@ use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 abstract class Query extends cmdbAbstractObject
 {

application/shortcut.class.inc.php

@@ -16,6 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 
 /**

application/template.class.inc.php

@@ -17,6 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages

application/ui.extkeywidget.class.inc.php

@@ -7,6 +7,7 @@
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 
 require_once(APPROOT.'/application/displayblock.class.inc.php');
@@ -65,7 +66,7 @@ class UIExtKeyWidget
 	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sAttCode
 	 * @param string $sClass
 	 * @param string $sTitle
@@ -132,7 +133,7 @@ class UIExtKeyWidget
 	}
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param bool $bAllowTargetCreation
 	 * @param string $sTitle
@@ -444,7 +445,7 @@ JS
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMaxComboLength
 	 * @param boolean $bAllowTargetCreation
 	 * @param string $sTitle

application/ui.htmleditorwidget.class.inc.php

@@ -16,6 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Class UIHTMLEditorWidget

application/ui.linksdirectwidget.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\Helper\FormHelper;
 use Combodo\iTop\Application\UI\Links\Direct\BlockDirectLinkSetEditTable;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 /**

application/ui.linkswidget.class.inc.php

@@ -8,6 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockIndirectLinkSetEditTable;
 use Combodo\iTop\Application\UI\Links\Indirect\BlockObjectPickerDialog;
+use Combodo\iTop\Application\WebPage\JsonPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 
 require_once(APPROOT.'application/displayblock.class.inc.php');

application/ui.passwordwidget.class.inc.php

@@ -24,6 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIPasswordWidget 

application/ui.searchformforeignkeys.class.inc.php

@@ -21,6 +21,8 @@
  */
 
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys

application/uiwizard.class.inc.php

@@ -15,6 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\iTopWebPage;
 
 
 /**

application/utils.inc.php

@@ -20,6 +20,8 @@
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
+use Combodo\iTop\Application\UI\Hook\iKeyboardShortcut;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Module\ModuleService;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\OutputStyle;
@@ -1453,7 +1455,7 @@ class utils
 	/**
 	 * Merge standard menu items with plugin provided menus items
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param int $iMenuId
 	 * @param \DBObjectSet $param
 	 * @param array $aActions
@@ -2956,7 +2958,7 @@ HTML;
 		$aResultPref = [];
 		$aShortcutPrefs = appUserPreferences::GetPref('keyboard_shortcuts', []);
 		// Note: Mind the 4 blackslashes, see utils::GetClassesForInterface()
-		$aShortcutClasses = utils::GetClassesForInterface('iKeyboardShortcut', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
+		$aShortcutClasses = utils::GetClassesForInterface(iKeyboardShortcut::class, '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]', '[\\\\/]tests[\\\\/]'));
 
 		foreach ($aShortcutClasses as $cShortcutPlugin) {
 			$sTriggeredElement = $cShortcutPlugin::GetShortcutTriggeredElementSelector();

application/wizardhelper.class.inc.php

@@ -24,6 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 require_once(APPROOT.'/application/uiwizard.class.inc.php');
 
 class WizardHelper
@@ -367,7 +369,7 @@ JS;
 	/**
 	 * Add necessary JS snippets (to the page) to be executed for fields update
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @return void
 	 * @since 3.0.3-2 3.0.4 3.1.1 3.2.0 N°6766
 	 */

composer.json

@@ -81,6 +81,9 @@
       "application/logindefault.class.inc.php",
       "application/loginexternal.class.inc.php",
       "application/loginurl.class.inc.php"
+    ],
+    "files": [
+      "sources/alias.php"
     ]
   },
   "conflict": {

core/action.class.inc.php

@@ -17,6 +17,7 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Persistent classes (internal): user defined actions
@@ -201,12 +202,39 @@ abstract class ActionNotification extends Action
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
 		// - Attributes to be displayed for a list
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'description', 'status'));
+		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
 		// Search criteria
 		// - Criteria of the std search form
 //		MetaModel::Init_SetZListItems('standard_search', array('name'));
 		// - Default criteria of the search form
 //		MetaModel::Init_SetZListItems('default_search', array('name'));
 	}
+
+	/**
+	 * @param $sLanguage
+	 * @param $sLanguageCode
+	 *
+	 * @return array [$sPreviousLanguage, $aPreviousPluginProperties]
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionUnknownLanguage
+	 * @since 3.2.0
+	 */
+	public function SetNotificationLanguage($sLanguage = null, $sLanguageCode = null){
+		$sPreviousLanguage = Dict::GetUserLanguage();
+		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
+		$sLanguage = $sLanguage ?? $this->Get('language');
+		$sLanguageCode = $sLanguageCode ?? $sLanguage;
+		if (!utils::IsNullOrEmptyString($sLanguage)) {
+			// If a language is specified for this action, force this language
+			// when rendering all placeholders inside this message
+			Dict::SetUserLanguage($sLanguage);
+			AttributeDateTime::LoadFormatFromConfig();
+			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $sLanguageCode);
+		}
+		return [$sPreviousLanguage, $aPreviousPluginProperties];
+	}
 }
 
 /**
@@ -273,7 +301,6 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values" => null, "sql" => "subject", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values" => null, "sql" => "body", "default_value" => null, "is_null_allowed" => false, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values" => new ValueSetEnum('low,normal,high'), "sql" => "importance", "default_value" => 'normal', "is_null_allowed" => false, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeBlob("html_template", array("is_null_allowed"=>true, "depends_on"=>array(), "always_load_in_tables"=>false)));
 		MetaModel::Init_AddAttribute(new AttributeEnum("ignore_notify", array("allowed_values" => new ValueSetEnum('yes,no'), "sql" => "ignore_notify", "default_value" => 'yes', "is_null_allowed" => false, "depends_on" => array())));
 		
@@ -561,15 +588,7 @@ class ActionEmail extends ActionNotification
 			'attachments' => [],
 		];
 		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		$sPreviousLanguage = Dict::GetUserLanguage();
-		$aPreviousPluginProperties = ApplicationContext::GetPluginProperties('QueryLocalizerPlugin');
-		if ($this->Get('language') !== '') {
-			// If a language is specified for this action, force this language
-			// when rendering all placeholders inside this message
-			Dict::SetUserLanguage($this->Get('language'));
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $this->Get('language'));
-		}
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
 
 		try
 		{
@@ -601,9 +620,7 @@ class ActionEmail extends ActionNotification
 		}
 		finally {
 			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-			Dict::SetUserLanguage($sPreviousLanguage);
-			AttributeDateTime::LoadFormatFromConfig();
-			ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', $aPreviousPluginProperties['language_code'] ?? null);
+			$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
 		}
 		
 		if (!is_null($oLog)) {

core/attributedef.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadgeUIBlockFactory;
 use Combodo\iTop\Application\UI\Links\Set\BlockLinkSetDisplayAsProperty;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Form\Field\LabelField;
 use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Form;
@@ -12996,7 +12997,7 @@ class AttributeRedundancySettings extends AttributeDBField
 	 * Display an option (form, or current value)
 	 *
 	 * @param string $sCurrentValue
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sFormPrefix
 	 * @param bool $bEditMode
 	 * @param string $sUserOption

core/autoload.php

@@ -25,6 +25,7 @@ MetaModel::IncludeModule('application/audit.domain.class.inc.php');
 MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 
+
 MetaModel::IncludeModule('core/event.class.inc.php');
 MetaModel::IncludeModule('core/action.class.inc.php');
 MetaModel::IncludeModule('core/trigger.class.inc.php');

core/bulkchange.class.inc.php

@@ -6,6 +6,9 @@
 
 // The BOM is added at the head of exported UTF-8 CSV data, and removed (if present) from input UTF-8 data.
 // This helps MS-Excel (Version > 2007, Windows only) in changing its interpretation of a CSV file (by default Excel reads data as ISO-8859-1 -not 100% sure!)
+use Combodo\iTop\Application\WebPage\iTopWebPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
 
 

core/bulkexport.class.inc.php

@@ -17,6 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 define('EXPORTER_DEFAULT_CHUNK_SIZE', 1000);
 
 class BulkExportException extends Exception
@@ -391,7 +394,7 @@ abstract class BulkExport
 
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/cmdbsource.class.inc.php

@@ -42,6 +42,12 @@ class CMDBSource
 	const ENUM_DB_VENDOR_MARIADB = 'MariaDB';
 	const ENUM_DB_VENDOR_PERCONA = 'Percona';
 
+	/**
+	 * @since 2.7.10 3.0.4 3.1.2 3.0.2 N°6889 constant creation
+	 * @internal will be removed in a future version
+	 */
+	const MYSQL_DEFAULT_PORT = 3306;
+
 	/**
 	 * Error: 1205 SQLSTATE: HY000 (ER_LOCK_WAIT_TIMEOUT)
 	 *   Message: Lock wait timeout exceeded; try restarting transaction
@@ -212,16 +218,19 @@ class CMDBSource
 	/**
 	 * @param string $sDbHost initial value ("p:domain:port" syntax)
 	 * @param string $sServer server variable to update
-	 * @param int $iPort port variable to update
+	 * @param int|null $iPort port variable to update, will return null if nothing is specified in $sDbHost
+	 *
+	 * @since 2.7.10 3.0.4 3.1.2 3.2.0 N°6889 will return null in $iPort if port isn't present in $sDbHost. Use {@see MYSQL_DEFAULT_PORT} if needed
+	 *
+	 * @link http://php.net/manual/en/mysqli.persistconns.php documentation for the "p:" prefix (persistent connexion)
 	 */
 	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
 	{
 		$aConnectInfo = explode(':', $sDbHost);
 
 		$bUsePersistentConnection = false;
-		if (strcasecmp($aConnectInfo[0], 'p') == 0)
+		if (strcasecmp($aConnectInfo[0], 'p') === 0)
 		{
-			// we might have "p:" prefix to use persistent connections (see http://php.net/manual/en/mysqli.persistconns.php)
 			$bUsePersistentConnection = true;
 			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
 		}
@@ -239,10 +248,6 @@ class CMDBSource
 		{
 			$iPort = (int)($aConnectInfo[1]);
 		}
-		else
-		{
-			$iPort = 3306;
-		}
 	}
 
 	/**

core/config.class.inc.php

@@ -889,6 +889,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+        'forgot_password.url' => [
+			'type'                => 'string',
+			'description'         => 'Set this value to your "forgot password" service URL if it should be handled out of '.ITOP_APPLICATION_SHORT.'. Note that it will apply to all users (iTop users, LDAP users, ...)',
+			'default'             => '',
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'deadline_format' => [
 			'type' => 'string',
 			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
@@ -1595,6 +1603,22 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'notifications.itop.read_notification_retention' => [
+			'type' => 'integer',
+			'description' => 'Duration in days after which iTop read notifications will be deleted',
+			'default' => 182,
+			'value' => 182,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
+		'notifications.itop.newsroom_cache_time' => [
+			'type' => 'integer',
+			'description' => 'Duration in min between each fetch for notifications in newsroom',
+			'default' => 5,
+			'value' => 5,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'regenerate_session_id_enabled' => [
 			'type' => 'bool',
 			'description' => 'If true then session id will be regenerated on each login, to prevent session fixation.',
@@ -1643,6 +1667,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'security.enable_header_xcontent_type_options' => [
+			'type' => 'bool',
+			'description' => 'If set to false, iTop will stop sending the X-Content-Type-Options HTTP header. This header could trigger CORB protection on certain resources (JSON, XML, HTML, text) therefore blocking them.',
+			'default' => true,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'security.disable_inline_documents_sandbox' => [
 			'type' => 'bool',
 			'description' => 'If true then the sandbox for documents displayed in a browser tab will be disabled; enabling scripts and other interactive content. Note that setting this to true will open the application to potential XSS attacks!',
@@ -1710,8 +1742,8 @@ class Config
 		'application.secret' => [
 			'type'                => 'string',
 			'description'         => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
-			'default'             => true,
-			'value'               => true,
+			'default'             => '',
+			'value'               => '',
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
@@ -2337,6 +2369,24 @@ class Config
 		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
 	}
 
+	/**
+	 * @since 2.7.11 N°7085
+	 * Add login mode if not configured already
+	 * @param string $sLoginMode
+	 *
+	 * @return void
+	 */
+	public function AddAllowedLoginTypes($sLoginMode)
+	{
+		$aAllowedLoginTypes = $this->GetAllowedLoginTypes();
+		if (in_array($sLoginMode, $aAllowedLoginTypes)){
+			return;
+		}
+
+		$aAllowedLoginTypes[] = $sLoginMode;
+		$this->SetAllowedLoginTypes($aAllowedLoginTypes);
+	}
+
 	public function SetExternalAuthenticationVariable($sExtAuthVariable)
 	{
 		$this->m_sExtAuthVariable = $sExtAuthVariable;

core/csvbulkexport.class.inc.php

@@ -13,6 +13,8 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
 use Combodo\iTop\Application\Helper\ExportHelper;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: CSV export
@@ -101,7 +103,7 @@ class CSVBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/datamodel.core.xml

@@ -1,5 +1,268 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+  <classes>
+    <class id="ActioniTopNotification"  _delta="define">
+      <php_parent>
+        <name>ActionNotification</name>
+      </php_parent>
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>grant_by_profile,core/cmdb,application</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_action_itop_notif</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="message" xsi:type="AttributeText">
+          <sql>message</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <sql>icon</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>256</storage_max_width>
+          <storage_max_height>256</storage_max_height>
+          <default_image>null</default_image>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <sql>priority</sql>
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="recipients" xsi:type="AttributeOQL">
+          <sql>recipients</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="url" xsi:type="AttributeString">
+          <sql>url</sql>
+          <default_value>$this->url()$</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="col:col1">
+              <items>
+                <item id="fieldset:ActioniTopNotification:content">
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="status">
+                      <rank>20</rank>
+                    </item>
+                    <item id="language">
+                      <rank>30</rank>
+                    </item>
+                    <item id="title">
+                      <rank>40</rank>
+                    </item>
+                    <item id="message">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <items>
+                <item id="fieldset:ActioniTopNotification:settings">
+                  <items>
+                    <item id="priority">
+                      <rank>10</rank>
+                    </item>
+                    <item id="icon">
+                      <rank>20</rank>
+                    </item>
+                    <item id="recipients">
+                      <rank>30</rank>
+                    </item>
+                    <item id="url">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="language">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods>
+        <method id="DoExecute">
+          <comment>	/**
+            *
+            *  Create EventiTopNotification for each recipient
+            * @param $oTrigger
+            * @param $aContextArgs
+            *
+            * @return void
+            * @throws \ArchivedObjectException
+            * @throws \CoreCannotSaveObjectException
+            * @throws \CoreException
+            * @throws \CoreUnexpectedValue
+            * @throws \CoreWarning
+            * @throws \MySQLException
+            * @throws \OQLException
+            */</comment>
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+              public function DoExecute($oTrigger, $aContextArgs)
+	{
+		$oRecipientsSearch = DBObjectSearch::FromOQL($this->Get('recipients'));
+		$oRecipientsSearch->AllowAllData();
+		$oRecipientsSet = new DBObjectSet($oRecipientsSearch);
+		[$sPreviousLanguage, $aPreviousPluginProperties] = $this->SetNotificationLanguage();
+		while ($oRecipient = $oRecipientsSet->Fetch()) {
+			$oEvent = new EventiTopNotification();
+			$oEvent->Set('title', MetaModel::ApplyParams($this->Get('title'), $aContextArgs));
+			$oEvent->Set('message', MetaModel::ApplyParams($this->Get('message'), $aContextArgs));
+			$oIcon = !$this->Get('icon')->IsEmpty() ? $this->Get('icon') : MetaModel::GetAttributeDef('EventiTopNotification', 'icon')->MakeRealValue(Combodo\iTop\Application\Branding::GetCompactMainLogoAbsoluteUrl(), $oEvent);
+			$oEvent->Set('icon', $oIcon);
+			$oEvent->Set('priority', $this->Get('priority'));
+			$oEvent->Set('contact_id', $oRecipient->GetKey());
+			$oEvent->Set('trigger_id', $oTrigger->GetKey());
+			$oEvent->Set('action_id', $this->GetKey());
+			$iObjectId = array_key_exists('this->object()', $aContextArgs) ? $aContextArgs['this->object()']->GetKey() : 0;
+			$oEvent->Set('object_id', $iObjectId);
+			$oEvent->Set('url', MetaModel::ApplyParams($this->Get('url'), $aContextArgs));
+			$oEvent->DBInsertNoReload();
+		}
+		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
+	}
+]]></code>
+        </method>
+      </methods>
+    </class>
+    <class id="EventiTopNotification"  _delta="define">
+      <php_parent>
+        <name>EventNotification</name>
+      </php_parent>
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>core/cmdb,view_in_gui</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_event_itop_notif</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <sql>icon</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <default_image>null</default_image>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <sql>priority</sql>
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="url" xsi:type="AttributeURL">
+          <sql>url</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+          <target>_blank</target>
+        </field>
+        <field id="read" xsi:type="AttributeEnum">
+          <sql>read</sql>
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="read_date" xsi:type="AttributeDateTime">
+          <sql>read_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <presentation/>
+      <methods/>
+    </class>
+  </classes>
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
@@ -287,6 +550,43 @@
           <interface id="iWorkingTimeComputer"/>
         </interfaces>
       </class>
+      <class id="ActionNotification" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>Action</parent>
+        <properties>
+          <category>grant_by_profile,core/cmdb</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="trigger_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="language" xsi:type="AttributeApplicationLanguage"/>
+        </fields>
+      </class>
+      <class id="EventNotification" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>Event</parent>
+        <properties>
+          <category>core/cmdb,view_in_gui</category>
+        </properties>
+        <fields>
+          <field id="message" xsi:type="AttributeText"/>
+          <field id="date" xsi:type="AttributeDateTime"/>
+          <field id="userinfo" xsi:type="AttributeString"/>
+          <field id="trigger_id" xsi:type="AttributeExternalKey">
+            <target_class>Trigger</target_class>
+          </field>
+          <field id="action_id" xsi:type="AttributeExternalKey">
+            <target_class>Action</target_class>
+          </field>
+          <field id="object_id" xsi:type="AttributeInteger"/>
+          <field id="trigger_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="trigger_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="action_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="action_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
     </classes>
     <attribute_properties_definition _delta="define">
       <properties>

core/dbobject.class.php

@@ -4,6 +4,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventException;
@@ -757,13 +758,26 @@ abstract class DBObject implements iDisplay
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		$iMaxSize = $oAttDef->GetMaxSize();
-		if ($iMaxSize && (strlen($sValue) > $iMaxSize))
-		{
-			$sValue = substr($sValue, 0, $iMaxSize);
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
+			$sMessage = " -truncated ($sLength chars)";
+			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
 		}
 		$this->Set($sAttCode, $sValue);
 	}
 
+	/**
+	 * @return void
+	 * @throws \ReflectionException
+	 */
+	protected function PostDeleteActions(): void
+	{
+		$this->FireEventAfterDelete();
+		$oKPI = new ExecutionKPI();
+		$this->AfterDelete();
+		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
+	}
+
 	/**
 	 * Compute (and optionally start) the StopWatches deadlines
 	 *
@@ -2099,33 +2113,26 @@ abstract class DBObject implements iDisplay
 				return true;
 			}
 
-			if ($toCheck instanceof ormSet)
-			{
+			if ($toCheck instanceof ormSet) {
 				return true;
 			}
 
 			return "Bad type";
-		}
-		elseif ($oAtt->IsScalar())
-		{
+		} elseif ($oAtt->IsScalar()) {
+
 			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
-			if (is_array($aValues) && (count($aValues) > 0))
-			{
-				if (!array_key_exists($toCheck, $aValues))
-				{
+			if (is_array($aValues) && (count($aValues) > 0)) {
+				if (!array_key_exists($toCheck, $aValues)) {
 					return "Value not allowed [$toCheck]";
 				}
 			}
-			if (!is_null($iMaxSize = $oAtt->GetMaxSize()))
-			{
-				$iLen = strlen($toCheck);
-				if ($iLen > $iMaxSize)
-				{
+			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
+				$iLen = mb_strlen($toCheck);
+				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}
 			}
-			if (!$oAtt->CheckFormat($toCheck))
-			{
+			if (!$oAtt->CheckFormat($toCheck)) {
 				return "Wrong format [$toCheck]";
 			}
 		}
@@ -4095,6 +4102,8 @@ abstract class DBObject implements iDisplay
 			return;
 		}
 
+		$this->SetReadOnly("No modification allowed before delete");
+		$this->FireEventAboutToDelete();
 		$oKPI = new ExecutionKPI();
 		$this->OnDelete();
 		$oKPI->ComputeStatsForExtension($this, 'OnDelete');
@@ -4204,15 +4213,13 @@ abstract class DBObject implements iDisplay
 			}
 		}
 
-		$this->FireEventAfterDelete();
-		$oKPI = new ExecutionKPI();
-		$this->AfterDelete();
-		$oKPI->ComputeStatsForExtension($this, 'AfterDelete');
+		$this->m_bIsInDB = false;
+
+		$this->PostDeleteActions();
 
 		// - Trigger for object pointing to the current object
 		$this->ActivateOnObjectUpdateTriggersForTargetObjects();
 
-		$this->m_bIsInDB = false;
 		$this->LogCRUDExit(__METHOD__);
 		// Fix for N°926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete
 		// objects, reported as bug N°926)
@@ -4268,6 +4275,7 @@ abstract class DBObject implements iDisplay
 				foreach ($aToDelete as $iId => $aData) {
 					/** @var \DBObject $oToDelete */
 					$oToDelete = $aData['to_delete'];
+
 					// The deletion based on a deletion plan should not be done for each object if the deletion plan is common (Trac #457)
 					// because for each object we would try to update all the preceding ones... that are already deleted
 					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
@@ -6615,6 +6623,14 @@ abstract class DBObject implements iDisplay
 	{
 	}
 
+	/**
+	 * @return void
+	 * @since 3.1.2
+	 */
+	protected function FireEventAboutToDelete(): void
+	{
+	}
+
 	/**
 	 * @return void
 	 * @since 3.1.0

core/displayablegraph.class.inc.php

@@ -21,6 +21,9 @@ use Combodo\iTop\Application\UI\Base\Component\MedallionIcon\MedallionIcon;
 use Combodo\iTop\Application\UI\Base\Component\Panel\Panel;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\iTopPDF;
+use Combodo\iTop\Application\WebPage\PDFPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 /**
@@ -62,7 +65,7 @@ class DisplayableNode extends GraphNode
 
 	public function GetWidth()
 	{
-		return max(32, 5*strlen($this->GetProperty('label'))); // approximation of the text's bounding box
+		return max(32, 5 * mb_strlen($this->GetProperty('label'))); // approximation of the text's bounding box
 	}
 
 	public function GetHeight()
@@ -491,7 +494,7 @@ class DisplayableNode extends GraphNode
 		if ($bNoLabel)
 		{
 			// simulate a fake label with the approximate same size as the true label
-			$sLabel = str_repeat('x',strlen($this->GetProperty('label', $this->GetId())));
+			$sLabel = str_repeat('x', mb_strlen($this->GetProperty('label', $this->GetId())));
 			$sDot = 'label="'.$sLabel.'"';
 		}
 		else
@@ -1580,7 +1583,7 @@ EOF
 	 * @param string $sContextKey
 	 * @param array $aContextParams
 	 * @param array $aExcludedObjects
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *
@@ -1602,7 +1605,7 @@ EOF
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param array $aResults
 	 * @param bool $bLazyLoading
 	 *

core/email.class.inc.php

@@ -46,6 +46,15 @@ class EMail implements iEMail
 	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
 	// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
 	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
+	
+	/** @var int ENUM_SEND_DEFAULT This option can be used when sending an e-mail to respect the default configuration parameter. */
+	const ENUM_SEND_DEFAULT = 0;
+	
+	/** @var int ENUM_SEND_FORCE_SYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: instant e-mail test. */
+	const ENUM_SEND_FORCE_SYNCHRONOUS = 1;
+	
+	/** @var int ENUM_SEND_FORCE_ASYNCHRONOUS This option can be used when sending an e-mail to ignore the default and force synchronous sending instead. Example of a use case: Bulk mails. */
+	const ENUM_SEND_FORCE_ASYNCHRONOUS = 2;
 
 	public function __construct()
 	{

core/event.class.inc.php

@@ -1,4 +1,7 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\WebPage;
+
 /**
  * Copyright (C) 2013-2023 Combodo SARL
  *
@@ -242,44 +245,33 @@ class EventIssue extends Event
 			{
 				if (is_string($sValue))
 				{
-					if (strlen($sValue) < 256)
-					{
+					if (mb_strlen($sValue) < 256) {
 						$aPost[$sKey] = $sValue;
+					} else {
+						$aPost[$sKey] = "!long string: ".mb_strlen($sValue)." chars";
 					}
-					else
-					{
-						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
-					}
-				}
-				else
-				{
+				} else {
 					// Not a string (avoid warnings in case the value cannot be easily casted into a string)
-					$aPost[$sKey] = @(string) $sValue;
+					$aPost[$sKey] = @(string)$sValue;
 				}
 			}
 			$this->Set('arguments_post', $aPost);
-		}
-		else
-		{
+		} else {
 			$this->Set('arguments_post', array());
 		}
-
-		$sLength = strlen($this->Get('issue'));
-		if ($sLength > 255)
-		{
-			$this->Set('issue', substr($this->Get('issue'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('issue'));
+		if ($sLength > 255) {
+			$this->Set('issue', mb_substr($this->Get('issue'), 0, 210)." -truncated ($sLength chars)");
 		}
 
-		$sLength = strlen($this->Get('impact'));
-		if ($sLength > 255)
-		{
-			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('impact'));
+		if ($sLength > 255) {
+			$this->Set('impact', mb_substr($this->Get('impact'), 0, 210)." -truncated ($sLength chars)");
 		}
 
-		$sLength = strlen($this->Get('page'));
-		if ($sLength > 255)
-		{
-			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
+		$sLength = mb_strlen($this->Get('page'));
+		if ($sLength > 255) {
+			$this->Set('page', mb_substr($this->Get('page'), 0, 210)." -truncated ($sLength chars)");
 		}
 	}
 }

core/excelbulkexport.class.inc.php

@@ -11,6 +11,8 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
 use Combodo\iTop\Application\Helper\ExportHelper;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'application/xlsxwriter.class.php');
 
@@ -69,7 +71,7 @@ class ExcelBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/expressioncache.class.inc.php

@@ -101,7 +101,7 @@ EOF;
 EOF;
 
 				SetupUtils::builddir(dirname($sFilePath));
-				file_put_contents($sFilePath, $content);
+				file_put_contents($sFilePath, $content, LOCK_EX);
 			}
 		}
 		Dict::SetUserLanguage($sUserLang);

core/htmlbulkexport.class.inc.php

@@ -15,6 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: HTML export
@@ -37,7 +39,7 @@ class HTMLBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/ormcaselog.class.inc.php

@@ -20,6 +20,7 @@ use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSec
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 define('CASELOG_VISIBLE_ITEMS', 2);

core/ormdocument.class.inc.php

@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 

core/pdfbulkexport.class.inc.php

@@ -12,6 +12,9 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\PDFPage;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: PDF export, based on the HTML export converted to PDF
@@ -49,7 +52,7 @@ class PDFBulkExport extends HTMLBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/spreadsheetbulkexport.class.inc.php

@@ -10,6 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: "spreadsheet" export: a simplified HTML export in which the date/time columns are split in two column: date AND time
@@ -34,7 +36,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tabularbulkexport.class.inc.php

@@ -6,6 +6,7 @@
 
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -22,7 +23,7 @@ abstract class TabularBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

core/tagsetfield.class.inc.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 
 /**
  * <p>Stores data for {@link AttributeTagSet} fields
@@ -296,7 +298,7 @@ abstract class TagSetFieldData extends cmdbAbstractObject
 	/**
 	 * Display Tag Usage
 	 *
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 *
 	 * @throws \CoreException

core/userrights.class.inc.php

@@ -1,6 +1,7 @@
 <?php
 
 use Combodo\iTop\Application\Helper\Session;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 define('UR_ALLOWED_NO', 0);
 define('UR_ALLOWED_YES', 1);
@@ -248,7 +249,7 @@ abstract class User extends cmdbAbstractObject
 			"depends_on"      => array(),
 		)));
 
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true)));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list",array("linked_class" => "URP_UserProfile", "ext_key_to_me" => "userid", "ext_key_to_remote" => "profileid", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), "display_style" => 'property', "with_php_constraint" => true, "with_php_computation" => true)));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class" => "URP_UserOrg", "ext_key_to_me" => "userid", "ext_key_to_remote" => "allowed_org_id", "allowed_values" => null, "count_min" => 1, "count_max" => 0, "depends_on" => array(), 'with_php_constraint' => true)));
 		MetaModel::Init_AddAttribute(new AttributeCaseLog("log", array("sql" => 'log', "is_null_allowed" => true, "default_value" => '', "allowed_values" => null, "depends_on" => array(), "always_load_in_tables" => false)));
 

core/xmlbulkexport.class.inc.php

@@ -8,6 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
 
 /**
  * Bulk export: XML export
@@ -30,7 +32,7 @@ class XMLBulkExport extends BulkExport
 	}
 
 	/**
-	 * @param \WebPage $oP
+	 * @param WebPage $oP
 	 * @param $sPartId
 	 *
 	 * @return UIContentBlock

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

@@ -21,6 +21,6 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLDAP' => 'LDAP felhasználó',
-	'Class:UserLDAP+' => '',
+	'Class:UserLDAP+' => 'LDAP vagy AD felhasználó',
 	'UserLDAP:server' => 'LDAP specifics~~',
 ));

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

@@ -21,7 +21,7 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' felhasználó',
-	'Class:UserLocal+' => '',
+    'Class:UserLocal+' => 'Rendszeren belül létrehozott felhasználó',
 	'Class:UserLocal/Attribute:password' => 'Jelszó',
 	'Class:UserLocal/Attribute:password+' => '',
 	'Class:UserLocal/Attribute:expiration' => 'Jelszó lejárati ideje',

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php

@@ -22,4 +22,4 @@
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'theme:darkmoon' => 'Dark moon',
-));
+));

datamodels/2.x/combodo-db-tools/dbtools.php

@@ -30,6 +30,7 @@ use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\Separator\ToolbarSeparatorUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;
 
 @include_once('../../approot.inc.php');
@@ -43,7 +44,7 @@ const MAX_RESULTS = 10;
  * @param iTopWebPage $oP
  * @param ApplicationContext $oAppContext
  *
- * @return \iTopWebPage
+ * @return iTopWebPage
  * @throws \CoreException
  * @throws \DictExceptionMissingString
  * @throws \MySQLException
@@ -294,7 +295,7 @@ function DisplayErrorDetails($aResults, $bVerbose)
  * @param iTopWebPage $oP
  * @param ApplicationContext $oAppContext
  *
- * @return \iTopWebPage
+ * @return iTopWebPage
  * @throws CoreException
  * @throws MySQLException
  * @throws \Exception

datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php

@@ -42,8 +42,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'DBTools:FetchCheck' => 'Lehívás ellenőrzés (hosszú)',
 	'DBTools:SelectAnalysisType' => 'Válasszon elemzés típust',
 	'DBTools:Analyze' => 'Elemzés',
-	'DBTools:Details' => 'Részletek mutatása',
-	'DBTools:ShowAll' => 'Minden hiba mutatása',
+    'DBTools:Details' => 'Részletek megjelenítése',
+    'DBTools:ShowAll' => 'Minden hiba megjelenítése',
 	'DBTools:Inconsistencies' => 'Adatbázis inkonzisztenciák',
 	'DBTools:DetailedErrorTitle' => '%2$s hiba a %1$s osztályban: %3$s',
 	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',

datamodels/2.x/itop-attachments/ajax.itop-attachment.php

@@ -17,11 +17,14 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\AjaxPage;
+use Combodo\iTop\Application\WebPage\JsonPage;
+
 require_once('../../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 
 /**
- * @param \AjaxPage $oPage
+ * @param \Combodo\iTop\Application\WebPage\AjaxPage $oPage
  * @param int $iTransactionId
  *
  * @throws \ArchivedObjectException

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

@@ -26,9 +26,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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)',
+	'Attachment:Max_Go' => '(Maximum file size: %1$s GB)',
+	'Attachment:Max_Mo' => '(Maximum file size: %1$s MB)',
+	'Attachment:Max_Ko' => '(Maximum file size: %1$s KB)',
 	'Attachments:NoAttachment' => 'No attachment. ',
 	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
 	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s',

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

@@ -34,7 +34,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Attachment:Max_Ko' => '(Maximum fájlméret: %1$s KB)',
 	'Attachments:NoAttachment' => 'Nincs melléklet. ',
 	'Attachments:PreviewNotAvailable' => 'Az előnézet nem érhető el ilyen típusú melléklethez',
-	'Attachments:Error:FileTooLarge' => 'Túl nagy a fájl a feltöltéshez. %1$s',
+    'Attachments:Error:FileTooLarge' => 'Túl nagy a %1$s fájl a feltöltéshez.',
 	'Attachments:Error:UploadedFileEmpty' => 'A kapott fájl üres, ezért nem csatolható. Vagy egy üres fájlt húzott be, vagy kérdezze meg a rendszergazdát, hátha az iTop szerver lemeze telt meg.',
 	'Attachments:Render:Icons' => 'Mutassa ikonként',
 	'Attachments:Render:Table' => 'Mutassa listaként',
@@ -52,7 +52,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Attachment/Attribute:expire+' => '~~',
 	'Class:Attachment/Attribute:temp_id' => 'Átmeneti azonosító',
 	'Class:Attachment/Attribute:temp_id+' => '~~',
-	'Class:Attachment/Attribute:item_class' => 'Elem osztály',
+    'Class:Attachment/Attribute:item_class' => 'Elem típus',
 	'Class:Attachment/Attribute:item_class+' => '~~',
 	'Class:Attachment/Attribute:item_id' => 'Elem',
 	'Class:Attachment/Attribute:item_id+' => '~~',

datamodels/2.x/itop-attachments/main.itop-attachments.php

@@ -4,6 +4,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\WebPage;
+
 class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExtension
 {
 	const ENUM_GUI_ALL = 'all';
@@ -221,7 +223,7 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 
 	/**
 	 * @param \DBObject $oObject
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param bool $bEditMode
 	 *
 	 * @throws \CoreException

datamodels/2.x/itop-attachments/renderers.itop-attachments.php

@@ -29,6 +29,7 @@ use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\FileSelect\FileSelectUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
+use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 define('ATTACHMENT_DISPLAY_URL', 'pages/ajax.render.php?operation=display_document&class=Attachment&field=contents&id=');
@@ -42,7 +43,7 @@ define('ATTACHMENTS_RENDERER', 'TableDetailsAttachmentsRenderer');
 class AttachmentsRendererFactory
 {
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sObjClass class name of the objects holding the attachments
 	 * @param int $iObjKey key of the objects holding the attachments
 	 * @param string $sTransactionId CSRF token
@@ -85,7 +86,7 @@ abstract class AbstractAttachmentsRenderer
 	 */
 	const ATTACHMENTS_LIST_CONTAINER_ID = 'AttachmentsListContainer';
 
-	/** @var \WebPage */
+	/** @var WebPage */
 	protected $oPage;
 	/**
 	 * @var string CSRF token, must be provided cause when getting content from AJAX we need the one from the original page, not the
@@ -102,14 +103,14 @@ abstract class AbstractAttachmentsRenderer
 	protected $oAttachmentsSet;
 
 	/**
-	 * @param \WebPage $oPage
+	 * @param WebPage $oPage
 	 * @param string $sObjClass class name of the objects holding the attachments
 	 * @param int $iObjKey key of the objects holding the attachments
 	 * @param string $sTransactionId CSRF token
 	 *
 	 * @throws \OQLException
 	 */
-	public function __construct(\WebPage $oPage, $sObjClass, $iObjKey, $sTransactionId)
+	public function __construct(WebPage $oPage, $sObjClass, $iObjKey, $sTransactionId)
 	{
 		$this->oPage = $oPage;
 		$this->sObjClass = $sObjClass;

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

@@ -17,6 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\AjaxPage;
+use Combodo\iTop\Application\WebPage\JsonPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 

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

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\Page;
+
 if (!defined('APPROOT'))
 {
 	if (file_exists(__DIR__.'/../../approot.inc.php'))
@@ -84,7 +86,7 @@ function Usage($oP)
 }
 
 /**
- * @param \Page $oP
+ * @param Page $oP
  *
  * @throws \DictExceptionUnknownLanguage
  * @throws \OQLException

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

@@ -27,6 +27,8 @@
 // /usr/bin/php -q /var/www/combodo/modules/itop-backup/check-backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
 // Do not forget to set the 'itop_backup_incident' configuration file parameter !
 
+use Combodo\iTop\Application\WebPage\CLIPage;
+
 if (file_exists(__DIR__.'/../../approot.inc.php'))
 {
 	require_once __DIR__.'/../../approot.inc.php';   // When in env-xxxx folder

datamodels/2.x/itop-backup/common.cli-execution.php

@@ -17,6 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\CLIPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 if (!defined('APPROOT'))
 {
 	if (file_exists(__DIR__.'/../../approot.inc.php'))

datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php

@@ -23,8 +23,8 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'bkp-backup-running' => 'A mentés fut. Kérem várjon...',
 	'bkp-restore-running' => 'A visszaállítás fut. Kérem várjon...',
-	'Menu:BackupStatus' => 'Ütemezett biztonsági mentés',
-	'bkp-status-title' => 'Ütemezett biztonsági mentés',
+    'Menu:BackupStatus' => 'Biztonsági mentés',
+    'bkp-status-title' => 'Adatbázis biztonsági mentés',
 	'bkp-status-checks' => 'Beállítás és ellenőrzés',
 	'bkp-mysqldump-ok' => 'mysqldump megvan: %1$s',
 	'bkp-mysqldump-notfound' => 'mysqldump nem található: %1$s - Győződjön meg róla, hogy telepítve van és szerepel az elérési útvonalban, vagy szerkessze a konfigurációs fájlt a mysql_bindir beállításához..',
@@ -43,7 +43,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'bkp-table-size+' => '~~',
 	'bkp-table-actions' => 'Műveletek',
 	'bkp-table-actions+' => '~~',
-	'bkp-status-backups-auto' => 'Ütemezett biztonsági mentés',
+    'bkp-status-backups-auto' => 'Automatikus biztonsági mentés',
 	'bkp-status-backups-manual' => 'Manuális biztonsági mentés',
 	'bkp-status-backups-none' => 'Még nincs biztonsági mentés',
 	'bkp-next-backup' => 'A következő mentés <b>%1$s</b> (%2$s) fog lefutni %3$s -kor',

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

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\WebPage\Page;
+
 if (!defined('APPROOT'))
 {
 	if (file_exists(__DIR__.'/../../approot.inc.php'))
@@ -87,7 +89,7 @@ function GetOperationName() {
 }
 
 /**
- * @param \Page $oP
+ * @param Page $oP
  *
  * @throws \DictExceptionUnknownLanguage
  * @throws \OQLException

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

@@ -25,6 +25,7 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 use Combodo\iTop\Application\UI\Base\UIBlock;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\Renderer\BlockRenderer;
 
 if (!defined('APPROOT')) {

datamodels/2.x/itop-bridge-cmdb-services/dictionaries/hu.dict.itop-bridge-cmdb-services.php

@@ -79,7 +79,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Document/Attribute:contracts_list' => 'Szerződések',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:contracts_list+' => 'Ehhez a dokumentumhoz kapcsolódó szerződések',
 	'Class:Document/Attribute:services_list' => 'Szolgáltatások',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-));
+	'Class:Document/Attribute:services_list+' => 'Ehhez a dokumentumhoz kapcsolódó szolgáltatások',
+));

datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php

@@ -36,9 +36,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Hibajegy',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+    'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referenciaszám',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Hibajegy cím',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Hibajegy tárgya',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
@@ -46,7 +46,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Hatása (szöveg)',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Hatása',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Hatás kód',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Kézzel hozzáadva',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Számított',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nincs hatása',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php

@@ -22,21 +22,21 @@
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ChangeManagement' => 'Változáskezelés',
 	'Menu:Change:Overview' => 'Áttekintő',
-	'Menu:Change:Overview+' => '~~',
-	'Menu:NewChange' => 'Új változás',
-	'Menu:NewChange+' => 'Új változásjegy létrehozása',
-	'Menu:SearchChanges' => 'Változás keresés',
-	'Menu:SearchChanges+' => 'Változásjegy keresés',
-	'Menu:Change:Shortcuts' => 'Gyorsgombok',
-	'Menu:Change:Shortcuts+' => '~~',
-	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
-	'Menu:WaitingAcceptance+' => '~~',
-	'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
-	'Menu:WaitingApproval+' => '~~',
-	'Menu:Changes' => 'Nyitott változási kérelmek',
-	'Menu:Changes+' => 'Minden nyitott változási kérelem',
-	'Menu:MyChanges' => 'Hozzám rendelt változások',
-	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)~~',
+    'Menu:Change:Overview+' => 'Áttekintő oldal',
+    'Menu:NewChange' => 'Új változás',
+    'Menu:NewChange+' => 'Új változásjegy létrehozása',
+    'Menu:SearchChanges' => 'Változás keresés',
+    'Menu:SearchChanges+' => 'Változásjegy keresés',
+    'Menu:Change:Shortcuts' => 'Gyorsgombok',
+    'Menu:Change:Shortcuts+' => 'Gyorselérés gombok',
+    'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
+    'Menu:WaitingAcceptance+' => 'Elfogadásra váró változások',
+    'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
+    'Menu:WaitingApproval+' => 'Jóváhagyásra váró változások',
+    'Menu:Changes' => 'Nyitott változási kérelmek',
+    'Menu:Changes+' => 'Nyitott változási kérelmek összesítése',
+    'Menu:MyChanges' => 'Hozzám rendelt változások',
+    'Menu:MyChanges+' => 'Ügyintézőként hozzám rendelt változások',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Változások kategóriánként az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-Last-7-days' => 'A változások száma az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
@@ -119,22 +119,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:outage/Value:yes+' => '',
 	'Class:Change/Attribute:fallback' => 'Visszavonás',
 	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Attribute:parent_id' => 'Szülő változás',
-	'Class:Change/Attribute:parent_id+' => '~~',
-	'Class:Change/Attribute:parent_name' => 'Szülő változás Ref',
-	'Class:Change/Attribute:parent_name+' => '~~',
-	'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Gyermek változások',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Szülő változás rövid név',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '~~',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Változás típus',
-	'Class:Change/Attribute:parent_id_finalclass_recall+' => '~~',
+    'Class:Change/Attribute:parent_id' => 'Fölérendelt változás',
+    'Class:Change/Attribute:parent_id+' => '',
+    'Class:Change/Attribute:parent_name' => 'Referenciaszám',
+    'Class:Change/Attribute:parent_name+' => '',
+    'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
+    'Class:Change/Attribute:related_request_list+' => 'Ehhez a változáshoz kapcsolódó felhasználói kérelmek',
+    'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
+    'Class:Change/Attribute:related_problems_list+' => 'Ehhez a változáshoz kapcsolódó problémák',
+    'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
+    'Class:Change/Attribute:related_incident_list+' => 'Ehhez a változáshoz kapcsolódó incidensek',
+    'Class:Change/Attribute:child_changes_list' => 'Kapcsolódó változások',
+    'Class:Change/Attribute:child_changes_list+' => 'Ehhez a változáshoz kapcsolódó változások',
+    'Class:Change/Attribute:parent_id_friendlyname' => 'Fölérendelt változás rövid név',
+    'Class:Change/Attribute:parent_id_friendlyname+' => '',
+    'Class:Change/Attribute:parent_id_finalclass_recall' => 'Változás típus',
+    'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
 	'Class:Change/Stimulus:ev_validate' => 'Ellenőrzés',
 	'Class:Change/Stimulus:ev_validate+' => '',
 	'Class:Change/Stimulus:ev_reject' => 'Elutasítás',

datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php

@@ -21,23 +21,23 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Menu:ChangeManagement' => 'Változáskezelés',
-	'Menu:Change:Overview' => 'Áttekintő',
-	'Menu:Change:Overview+' => '~~',
-	'Menu:NewChange' => 'Új változás',
-	'Menu:NewChange+' => 'Új változásjegy létrehozása',
-	'Menu:SearchChanges' => 'Változás keresés',
-	'Menu:SearchChanges+' => 'Változásjegy keresés',
-	'Menu:Change:Shortcuts' => 'Gyorsgombok',
-	'Menu:Change:Shortcuts+' => '~~',
-	'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
-	'Menu:WaitingAcceptance+' => '~~',
-	'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
-	'Menu:WaitingApproval+' => '~~',
-	'Menu:Changes' => 'Nyitott változási kérelmek',
-	'Menu:Changes+' => 'Minden nyitott változási kérelem',
-	'Menu:MyChanges' => 'Hozzám rendelt változások',
-	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)~~',
+    'Menu:ChangeManagement' => 'Változáskezelés',
+    'Menu:Change:Overview' => 'Áttekintő',
+    'Menu:Change:Overview+' => 'Áttekintő oldal',
+    'Menu:NewChange' => 'Új változás',
+    'Menu:NewChange+' => 'Új változásjegy létrehozása',
+    'Menu:SearchChanges' => 'Változás keresés',
+    'Menu:SearchChanges+' => 'Változásjegy keresés',
+    'Menu:Change:Shortcuts' => 'Gyorsgombok',
+    'Menu:Change:Shortcuts+' => 'Gyorselérés gombok',
+    'Menu:WaitingAcceptance' => 'Elfogadásra váró változások',
+    'Menu:WaitingAcceptance+' => 'Elfogadásra váró változások',
+    'Menu:WaitingApproval' => 'Jóváhagyásra váró változások',
+    'Menu:WaitingApproval+' => 'Jóváhagyásra váró változások',
+    'Menu:Changes' => 'Nyitott változási kérelmek',
+    'Menu:Changes+' => 'Nyitott változási kérelmek összesítése',
+    'Menu:MyChanges' => 'Hozzám rendelt változások',
+    'Menu:MyChanges+' => 'Ügyintézőként hozzám rendelt változások',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Változások kategóriánként az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-Last-7-days' => 'A változások száma az elmúlt 7 napban',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Változások tartományonként az elmúlt 7 napban',
@@ -81,26 +81,26 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:category' => 'Kategória',
 	'Class:Change/Attribute:category+' => '~~',
 	'Class:Change/Attribute:category/Value:application' => 'Alkalmazás',
-	'Class:Change/Attribute:category/Value:application+' => 'application~~',
+	'Class:Change/Attribute:category/Value:application+' => '',
 	'Class:Change/Attribute:category/Value:hardware' => 'Hardver',
-	'Class:Change/Attribute:category/Value:hardware+' => 'hardware~~',
+	'Class:Change/Attribute:category/Value:hardware+' => '',
 	'Class:Change/Attribute:category/Value:network' => 'Hálózat',
-	'Class:Change/Attribute:category/Value:network+' => 'network~~',
+	'Class:Change/Attribute:category/Value:network+' => '',
 	'Class:Change/Attribute:category/Value:other' => 'Egyéb',
-	'Class:Change/Attribute:category/Value:other+' => 'other~~',
+	'Class:Change/Attribute:category/Value:other+' => '',
 	'Class:Change/Attribute:category/Value:software' => 'Szoftver',
-	'Class:Change/Attribute:category/Value:software+' => 'software~~',
+	'Class:Change/Attribute:category/Value:software+' => '',
 	'Class:Change/Attribute:category/Value:system' => 'Rendszer',
-	'Class:Change/Attribute:category/Value:system+' => 'system~~',
+	'Class:Change/Attribute:category/Value:system+' => '',
 	'Class:Change/Attribute:reject_reason' => 'Elutasítás oka',
 	'Class:Change/Attribute:reject_reason+' => '~~',
 	'Class:Change/Attribute:changemanager_id' => 'Változás menedzser',
 	'Class:Change/Attribute:changemanager_id+' => '~~',
 	'Class:Change/Attribute:changemanager_email' => 'Változás menedzser email címe',
 	'Class:Change/Attribute:changemanager_email+' => '~~',
-	'Class:Change/Attribute:parent_id' => 'Szülő változás',
-	'Class:Change/Attribute:parent_id+' => '~~',
-	'Class:Change/Attribute:parent_name' => 'Szülő változás ref.',
+    'Class:Change/Attribute:parent_id' => 'Fölérendelt változás',
+    'Class:Change/Attribute:parent_id+' => '~~',
+    'Class:Change/Attribute:parent_name' => 'Referenciaszám',
 	'Class:Change/Attribute:parent_name+' => '~~',
 	'Class:Change/Attribute:creation_date' => 'Létrehozás dátuma',
 	'Class:Change/Attribute:creation_date+' => '~~',
@@ -109,14 +109,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Change/Attribute:fallback_plan' => 'Tartalék terv',
 	'Class:Change/Attribute:fallback_plan+' => '~~',
 	'Class:Change/Attribute:related_request_list' => 'Kapcsolódó kérelmek',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Gyermek változások',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Szülő változás rövid név',
+    'Class:Change/Attribute:related_request_list+' => 'Ehhez a változáshoz kapcsolódó felhasználói kérelmek',
+    'Class:Change/Attribute:related_incident_list' => 'Kapcsolódó incidensek',
+    'Class:Change/Attribute:related_incident_list+' => 'Ehhez a változáshoz kapcsolódó incidensek',
+    'Class:Change/Attribute:related_problems_list' => 'Kapcsolódó problémák',
+    'Class:Change/Attribute:related_problems_list+' => 'Ehhez a változáshoz kapcsolódó problémák',
+    'Class:Change/Attribute:child_changes_list' => 'Kapcsolódó változások',
+    'Class:Change/Attribute:child_changes_list+' => 'Ehhez a változáshoz kapcsolódó változások',
+    'Class:Change/Attribute:parent_id_friendlyname' => 'Fölérendelt változás rövid név',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '~~',
 	'Class:Change/Stimulus:ev_assign' => 'Hozzárendelés',
 	'Class:Change/Stimulus:ev_assign+' => '~~',

datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php

@@ -20,17 +20,17 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Relation:impacts/Description'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/DownStream'     => 'Hatás',
-	'Relation:impacts/DownStream+'    => 'Konfigurációs elem működését befolyásolják',
-	'Relation:impacts/UpStream'       => 'Függőségek',
-	'Relation:impacts/UpStream+'      => 'Konfigurációs elemtől függnek',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
-	'Relation:depends on/DownStream'  => 'Függőségek',
-	'Relation:depends on/UpStream'    => 'Hatások',
-	'Relation:impacts/LoadData'       => 'Adat betöltés',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
+    'Relation:impacts/Description' => 'Konfigurációs elem működését befolyásolják',
+    'Relation:impacts/DownStream' => 'Hatáselemzés',
+    'Relation:impacts/DownStream+' => 'Konfigurációs elem működését befolyásolják',
+    'Relation:impacts/UpStream' => 'Függőségek',
+    'Relation:impacts/UpStream+' => 'Konfigurációs elemtől függnek',
+    // Legacy entries
+    'Relation:depends on/Description' => 'Konfigurációs elemtől függnek',
+    'Relation:depends on/DownStream' => 'Függőségek',
+    'Relation:depends on/UpStream' => 'Hatáselemzés',
+    'Relation:impacts/LoadData'       => 'Adat betöltés',
+    'Relation:impacts/NoFilteredData' => 'kérjük, válassza ki az objektumokat a grafikus nézetben',
 	'Relation:impacts/FilteredData'   => 'Filtered data~~',
 ));
 
@@ -97,16 +97,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:FunctionalCI' => 'Funkcionális CI',
 	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Név',
+	'Class:FunctionalCI/Attribute:name' => 'CI Név',
 	'Class:FunctionalCI/Attribute:name+' => '',
 	'Class:FunctionalCI/Attribute:description' => 'Leírás',
-	'Class:FunctionalCI/Attribute:description+' => '~~',
-	'Class:FunctionalCI/Attribute:org_id' => 'Tulajdonos szevezeti egység',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Tulajdonos szervezeti egység',
 	'Class:FunctionalCI/Attribute:org_id+' => '',
 	'Class:FunctionalCI/Attribute:organization_name' => 'Szervezeti egység név',
 	'Class:FunctionalCI/Attribute:organization_name+' => 'Általános név',
 	'Class:FunctionalCI/Attribute:business_criticity' => 'Üzlet kritikusság',
-	'Class:FunctionalCI/Attribute:business_criticity+' => '~~',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'magas',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'alacsony',
@@ -114,7 +114,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'közepes',
 	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
 	'Class:FunctionalCI/Attribute:move2production' => 'Használatba vétel dátuma',
-	'Class:FunctionalCI/Attribute:move2production+' => '~~',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
 	'Class:FunctionalCI/Attribute:contacts_list' => 'Kapcsolattartók',
 	'Class:FunctionalCI/Attribute:contacts_list+' => 'Kapcsolattartók ehhez a konfigurációs elemhez',
 	'Class:FunctionalCI/Attribute:documents_list' => 'Dokumentumok',
@@ -123,9 +123,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alkalmazásmegoldások, melyek ettől a konfigurációs elemtől függenek',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Szoftverek',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Szoftverek, melyek erre a konfigurációs elemre vannak telepítve',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Típus',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktív hibajegyek',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI típus',
+    'Class:FunctionalCI/Attribute:finalclass+' => '',
+    'Class:FunctionalCI/Tab:OpenedTickets' => 'Nyitott hibajegyek',
 	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));
 
@@ -146,10 +146,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PhysicalDevice/Attribute:status' => 'Állapot',
 	'Class:PhysicalDevice/Attribute:status+' => '~~',
 	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementáció',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Elavult',
 	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Használatban',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Bevezetve',
 	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
 	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Készleten',
 	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
@@ -159,7 +159,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PhysicalDevice/Attribute:brand_name+' => '~~',
 	'Class:PhysicalDevice/Attribute:model_id' => 'Modell',
 	'Class:PhysicalDevice/Attribute:model_id+' => '~~',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Modellnév',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Modell név',
 	'Class:PhysicalDevice/Attribute:model_name+' => '~~',
 	'Class:PhysicalDevice/Attribute:asset_number' => 'Leltári szám',
 	'Class:PhysicalDevice/Attribute:asset_number+' => '~~',
@@ -181,8 +181,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Rack/Attribute:nb_u+' => '~~',
 	'Class:Rack/Attribute:device_list' => 'Eszközök',
 	'Class:Rack/Attribute:device_list+' => 'Minden fizikai eszköz amely ebbe a rack-be lett beszerelve',
-	'Class:Rack/Attribute:enclosure_list' => 'Készülékházak',
-	'Class:Rack/Attribute:enclosure_list+' => 'Minden készülékház ebben a rack-ben',
+    'Class:Rack/Attribute:enclosure_list' => 'Beépítőkeretek',
+    'Class:Rack/Attribute:enclosure_list+' => 'Minden beépítőkeret ebben a rack-ben',
 ));
 
 //
@@ -262,14 +262,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:DatacenterDevice/Attribute:rack_id+' => '~~',
 	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack név',
 	'Class:DatacenterDevice/Attribute:rack_name+' => '~~',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Készülékház',
-	'Class:DatacenterDevice/Attribute:enclosure_id+' => '~~',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Készülékház név',
-	'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Unit magasság',
-	'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Menedzsment IP cím',
-	'Class:DatacenterDevice/Attribute:managementip+' => '~~',
+    'Class:DatacenterDevice/Attribute:enclosure_id' => 'Beépítőkeret',
+    'Class:DatacenterDevice/Attribute:enclosure_id+' => '~~',
+    'Class:DatacenterDevice/Attribute:enclosure_name' => 'Beépítőkeret név',
+    'Class:DatacenterDevice/Attribute:enclosure_name+' => '~~',
+    'Class:DatacenterDevice/Attribute:nb_u' => 'Unit magasság',
+    'Class:DatacenterDevice/Attribute:nb_u+' => '~~',
+    'Class:DatacenterDevice/Attribute:managementip' => 'Menedzsment IP cím',
+    'Class:DatacenterDevice/Attribute:managementip+' => 'Az eszköz konfigurációs felületének az ip címe',
 	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA áramforrás',
 	'Class:DatacenterDevice/Attribute:powerA_id+' => '~~',
 	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA áramforrás név',
@@ -304,11 +304,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Kapcsolódó eszközök',
 	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Az összes eszköz, amely ehhez a hálózati eszközhöz csatlakozik',
 	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS verzió',
-	'Class:NetworkDevice/Attribute:iosversion_id+' => '~~',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS verzió név',
-	'Class:NetworkDevice/Attribute:iosversion_name+' => '~~',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
+    'Class:NetworkDevice/Attribute:iosversion_id+' => 'A hálózati eszköz firmware-je',
+    'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS verzió név',
+    'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+    'Class:NetworkDevice/Attribute:ram' => 'RAM',
+    'Class:NetworkDevice/Attribute:ram+' => 'Műveleti memória',
 ));
 
 //
@@ -320,21 +320,21 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Server+' => '',
 	'Class:Server/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Server/Attribute:osfamily_id' => 'OS család',
-	'Class:Server/Attribute:osfamily_id+' => '~~',
+	'Class:Server/Attribute:osfamily_id+' => '',
 	'Class:Server/Attribute:osfamily_name' => 'OS család név',
-	'Class:Server/Attribute:osfamily_name+' => '~~',
+	'Class:Server/Attribute:osfamily_name+' => '',
 	'Class:Server/Attribute:osversion_id' => 'OS verzió',
-	'Class:Server/Attribute:osversion_id+' => '~~',
+	'Class:Server/Attribute:osversion_id+' => '',
 	'Class:Server/Attribute:osversion_name' => 'OS verzió név',
-	'Class:Server/Attribute:osversion_name+' => '~~',
+	'Class:Server/Attribute:osversion_name+' => '',
 	'Class:Server/Attribute:oslicence_id' => 'OS licenc',
-	'Class:Server/Attribute:oslicence_id+' => '~~',
+	'Class:Server/Attribute:oslicence_id+' => '',
 	'Class:Server/Attribute:oslicence_name' => 'OS licenc név',
-	'Class:Server/Attribute:oslicence_name+' => '~~',
+	'Class:Server/Attribute:oslicence_name+' => '',
 	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => 'RAM',
-	'Class:Server/Attribute:ram+' => '',
+    'Class:Server/Attribute:cpu+' => 'Processzor típus',
+    'Class:Server/Attribute:ram' => 'RAM',
+    'Class:Server/Attribute:ram+' => 'Műveleti memória',
 	'Class:Server/Attribute:logicalvolumes_list' => 'Logikai kötetek',
 	'Class:Server/Attribute:logicalvolumes_list+' => 'Logikai kötetek, melyek ehhez a szerverhez kapcsolódnak',
 ));
@@ -345,7 +345,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:StorageSystem' => 'Tárolórendszer',
-	'Class:StorageSystem+' => '~~',
+	'Class:StorageSystem+' => '',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logikai kötetek',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Logikai kötetek ebben a tárolórendszerben',
@@ -357,7 +357,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => '~~',
+    'Class:SANSwitch+' => 'Tárolórendszer switch',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Kapcsolódó eszközök',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Ehhez a SAN-switch-hez csatlakozó konfigurációs elemek',
@@ -369,10 +369,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:TapeLibrary' => 'Szalagos tároló',
-	'Class:TapeLibrary+' => '~~',
+    'Class:TapeLibrary+' => 'Mágnesszalagos tároló',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Szalagok',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok a szalagos tárolóhoz',
+    'Class:TapeLibrary/Attribute:tapes_list+' => 'Szalagok (kazetták) a szalagos tárolóhoz',
 ));
 
 //
@@ -381,7 +381,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '~~',
+    'Class:NAS+' => 'Hálózati adattároló',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Fájlrendszerek',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'A NAS fájlrendszerei',
@@ -393,22 +393,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PC' => 'PC',
-	'Class:PC+' => '',
+    'Class:PC+' => 'Személyi számítógép',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PC/Attribute:osfamily_id' => 'OS család',
-	'Class:PC/Attribute:osfamily_id+' => '~~',
+	'Class:PC/Attribute:osfamily_id+' => '',
 	'Class:PC/Attribute:osfamily_name' => 'OS család név',
-	'Class:PC/Attribute:osfamily_name+' => '~~',
+	'Class:PC/Attribute:osfamily_name+' => '',
 	'Class:PC/Attribute:osversion_id' => 'OS verzió',
-	'Class:PC/Attribute:osversion_id+' => '~~',
+	'Class:PC/Attribute:osversion_id+' => '',
 	'Class:PC/Attribute:osversion_name' => 'OS verzió név',
-	'Class:PC/Attribute:osversion_name+' => '~~',
+	'Class:PC/Attribute:osversion_name+' => '',
 	'Class:PC/Attribute:cpu' => 'CPU',
 	'Class:PC/Attribute:cpu+' => '',
 	'Class:PC/Attribute:ram' => 'RAM',
 	'Class:PC/Attribute:ram+' => '',
 	'Class:PC/Attribute:type' => 'Típus',
-	'Class:PC/Attribute:type+' => '~~',
+	'Class:PC/Attribute:type+' => '',
 	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
 	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
 	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
@@ -441,7 +441,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PowerSource' => 'Áramforrás',
-	'Class:PowerSource+' => '~~',
+    'Class:PowerSource+' => 'UPS, generátor, akkumulátor stb.',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU-k',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Tápelosztók amik ezt az áramforrást használják',
@@ -453,16 +453,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '~~',
+    'Class:PDU+' => 'Tápelosztó a rack-ben',
 	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s~~',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '~~',
 	'Class:PDU/Attribute:rack_name' => 'Rack név',
 	'Class:PDU/Attribute:rack_name+' => '~~',
-	'Class:PDU/Attribute:powerstart_id' => 'Betápláló',
-	'Class:PDU/Attribute:powerstart_id+' => '~~',
-	'Class:PDU/Attribute:powerstart_name' => 'Betápláló név',
-	'Class:PDU/Attribute:powerstart_name+' => '~~',
+    'Class:PDU/Attribute:powerstart_id' => 'Áramforrás',
+    'Class:PDU/Attribute:powerstart_id+' => '~~',
+    'Class:PDU/Attribute:powerstart_name' => 'Áramforrás név',
+    'Class:PDU/Attribute:powerstart_name+' => '~~',
 ));
 
 //
@@ -480,8 +480,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Enclosure' => 'Készülékház',
-	'Class:Enclosure+' => '~~',
+    'Class:Enclosure' => 'Beépítőkeret',
+    'Class:Enclosure+' => 'Rack-be szerelhető készülékszerelvény',
 	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s~~',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '~~',
@@ -498,14 +498,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:ApplicationSolution' => 'Egyedi alkalmazás',
-	'Class:ApplicationSolution+' => '',
+    'Class:ApplicationSolution' => 'Alkalmazásmegoldás',
+    'Class:ApplicationSolution+' => 'Több alkalmazás és CI kombinációja egy adott feladatra',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CI-k',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ezt az alkalmazásmegoldást alkotják',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Üzleti folyamatok',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Üzleti folyamatok, melyek ettől az alkalmazásmegoldástól függenek',
 	'Class:ApplicationSolution/Attribute:status' => 'Állapot',
-	'Class:ApplicationSolution/Attribute:status+' => '~~',
+	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktív',
 	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
 	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktív',
@@ -522,11 +522,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:BusinessProcess' => 'Üzleti folyamat',
-	'Class:BusinessProcess+' => '',
+    'Class:BusinessProcess+' => 'Személyek, szolgáltatások és CI-k értékteremtő kombinációja',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Alkalmazásmegoldások',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alkalmazásmegoldások melyek hatással vannak erre az üzleti folyamatra',
 	'Class:BusinessProcess/Attribute:status' => 'Állapot',
-	'Class:BusinessProcess/Attribute:status+' => '~~',
+	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktív',
 	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
 	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktív',
@@ -539,27 +539,27 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:SoftwareInstance' => 'Szoftverpéldány',
-	'Class:SoftwareInstance+' => '',
+    'Class:SoftwareInstance+' => 'A szoftver telepített példányai',
 	'Class:SoftwareInstance/Attribute:system_id' => 'Rendszer',
-	'Class:SoftwareInstance/Attribute:system_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
 	'Class:SoftwareInstance/Attribute:system_name' => 'Rendszer név',
-	'Class:SoftwareInstance/Attribute:system_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
 	'Class:SoftwareInstance/Attribute:software_id' => 'Szoftver',
-	'Class:SoftwareInstance/Attribute:software_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
 	'Class:SoftwareInstance/Attribute:software_name' => 'Szoftvernév',
 	'Class:SoftwareInstance/Attribute:software_name+' => '',
 	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Szoftver licenc',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
 	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Szoftver licenc név',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
 	'Class:SoftwareInstance/Attribute:path' => 'Elérési út',
-	'Class:SoftwareInstance/Attribute:path+' => '~~',
+	'Class:SoftwareInstance/Attribute:path+' => '',
 	'Class:SoftwareInstance/Attribute:status' => 'Állapot',
-	'Class:SoftwareInstance/Attribute:status+' => '~~',
+	'Class:SoftwareInstance/Attribute:status+' => '',
 	'Class:SoftwareInstance/Attribute:status/Value:active' => 'Aktív',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
 	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inaktív',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
 ));
 
 //
@@ -568,9 +568,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => 'Köztes szoftver',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware példány',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Middleware példányok melyeket ez a middlaware biztosít',
+    'Class:Middleware+' => 'Köztes szoftver rendszerek összekötéséhez',
+    'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware példányok',
+    'Class:Middleware/Attribute:middlewareinstance_list+' => 'Middleware példányok melyeket ez a middleware biztosít',
 ));
 
 //
@@ -578,8 +578,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DBServer' => 'Adatbázis',
-	'Class:DBServer+' => '',
+    'Class:DBServer' => 'Adatbázis szerver',
+    'Class:DBServer+' => 'Adatbázis kiszolgáló',
 	'Class:DBServer/Attribute:dbschema_list' => 'DB sémák',
 	'Class:DBServer/Attribute:dbschema_list+' => 'A DB szerver adatbázis sémái',
 ));
@@ -590,7 +590,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:WebServer' => 'Webszerver',
-	'Class:WebServer+' => '~~',
+    'Class:WebServer+' => 'Webkiszolgáló',
 	'Class:WebServer/Attribute:webapp_list' => 'Webalkalmazások',
 	'Class:WebServer/Attribute:webapp_list+' => 'Webalkalmazások, melyek elérhetőek ezen a webszerveren',
 ));
@@ -601,7 +601,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:PCSoftware' => 'PC Szoftver',
-	'Class:PCSoftware+' => '~~',
+    'Class:PCSoftware+' => 'Személyi számítógép szoftverei',
 ));
 
 //
@@ -671,7 +671,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
 	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Elavult',
 	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'Használatban',
+    'Class:VirtualDevice/Attribute:status/Value:production' => 'Bevezetve',
 	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
 	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Készleten',
 	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
@@ -696,7 +696,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '~~',
+    'Class:Hypervisor+' => 'Virtuális gépeket futtató szoftver',
 	'Class:Hypervisor/Attribute:farm_id' => 'Szerverfarm',
 	'Class:Hypervisor/Attribute:farm_id+' => '~~',
 	'Class:Hypervisor/Attribute:farm_name' => 'Szerverfarm név',
@@ -713,9 +713,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Farm' => 'Szerverfarm',
-	'Class:Farm+' => '~~',
+    'Class:Farm+' => 'Szerverek egy klaszterben',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisor-ok',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+    'Class:Farm/Attribute:hypervisor_list+' => 'Hypervisor-ok amelyek a farmot alkotják',
 	'Class:Farm/Attribute:redundancy' => 'Magas rendelkezésre állás',
 	'Class:Farm/Attribute:redundancy/disabled' => 'A farm működik, ha az összes hypervisor működik.',
 	'Class:Farm/Attribute:redundancy/count' => 'A farm működik, ha legalább %1$s hypervisor működik',
@@ -771,7 +771,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:LogicalVolume/Attribute:description+' => '~~',
 	'Class:LogicalVolume/Attribute:raid_level' => 'Raid szint',
 	'Class:LogicalVolume/Attribute:raid_level+' => '~~',
-	'Class:LogicalVolume/Attribute:size' => 'Méret',
+    'Class:LogicalVolume/Attribute:size' => 'Tárhely',
 	'Class:LogicalVolume/Attribute:size+' => '~~',
 	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Tárolórendszer',
 	'Class:LogicalVolume/Attribute:storagesystem_id+' => '~~',
@@ -799,7 +799,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkServerToVolume/Attribute:server_id+' => '~~',
 	'Class:lnkServerToVolume/Attribute:server_name' => 'Szerver név',
 	'Class:lnkServerToVolume/Attribute:server_name+' => '~~',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Felhasznált méret',
+    'Class:lnkServerToVolume/Attribute:size_used' => 'Felhasznált tárhely',
 	'Class:lnkServerToVolume/Attribute:size_used+' => '~~',
 ));
 
@@ -819,7 +819,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtuális eszköz név',
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Felhasznált méret',
+    'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Felhasznált tárhely',
 	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '~~',
 ));
 
@@ -852,11 +852,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Tape' => 'Szalag',
 	'Class:Tape+' => '~~',
-	'Class:Tape/Attribute:name' => 'Név',
+    'Class:Tape/Attribute:name' => 'Szalag név',
 	'Class:Tape/Attribute:name+' => '~~',
 	'Class:Tape/Attribute:description' => 'Leírás',
 	'Class:Tape/Attribute:description+' => '~~',
-	'Class:Tape/Attribute:size' => 'Méret',
+    'Class:Tape/Attribute:size' => 'Tárhely',
 	'Class:Tape/Attribute:size+' => '~~',
 	'Class:Tape/Attribute:tapelibrary_id' => 'Szalagos tároló',
 	'Class:Tape/Attribute:tapelibrary_id+' => '~~',
@@ -871,13 +871,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NASFileSystem' => 'NAS Fájlrendszer',
 	'Class:NASFileSystem+' => '~~',
-	'Class:NASFileSystem/Attribute:name' => 'Név',
+    'Class:NASFileSystem/Attribute:name' => 'Fájlrendszer név',
 	'Class:NASFileSystem/Attribute:name+' => '~~',
 	'Class:NASFileSystem/Attribute:description' => 'Leírás',
 	'Class:NASFileSystem/Attribute:description+' => '~~',
 	'Class:NASFileSystem/Attribute:raid_level' => 'Raid szint',
 	'Class:NASFileSystem/Attribute:raid_level+' => '~~',
-	'Class:NASFileSystem/Attribute:size' => 'Méret',
+    'Class:NASFileSystem/Attribute:size' => 'Tárhely',
 	'Class:NASFileSystem/Attribute:size+' => '~~',
 	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
 	'Class:NASFileSystem/Attribute:nas_id+' => '~~',
@@ -926,16 +926,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Patch' => 'Javítócsomag',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Név',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:documents_list' => 'Dokumentumok',
-	'Class:Patch/Attribute:documents_list+' => 'A javítócsomag dokumentumai',
-	'Class:Patch/Attribute:description' => 'Leírás',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Típus',
-	'Class:Patch/Attribute:finalclass+' => 'A végső osztály neve',
+    'Class:Patch' => 'Szervizcsomag',
+    'Class:Patch+' => 'Szoftver patch',
+    'Class:Patch/Attribute:name' => 'Szervizcsomag név',
+    'Class:Patch/Attribute:name+' => '',
+    'Class:Patch/Attribute:documents_list' => 'Dokumentumok',
+    'Class:Patch/Attribute:documents_list+' => 'A szervizcsomag dokumentumai',
+    'Class:Patch/Attribute:description' => 'Leírás',
+    'Class:Patch/Attribute:description+' => '',
+    'Class:Patch/Attribute:finalclass' => 'Szervizcsomag típus',
+    'Class:Patch/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -944,7 +944,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OSPatch' => 'OS javítócsomag',
-	'Class:OSPatch+' => '~~',
+    'Class:OSPatch+' => 'Operációs rendszer szervizcsomag',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Eszközök',
 	'Class:OSPatch/Attribute:functionalcis_list+' => 'Rendszerek, amelyekre telepítve lett ez az OS javítócsomag',
 	'Class:OSPatch/Attribute:osversion_id' => 'OS verzió',
@@ -958,7 +958,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:SoftwarePatch' => 'Szoftver javítócsomag',
+    'Class:SoftwarePatch' => 'Szoftver szervizcsomag',
 	'Class:SoftwarePatch+' => '~~',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Szoftver',
 	'Class:SoftwarePatch/Attribute:software_id+' => '~~',
@@ -973,34 +973,34 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Licence' => 'Licensz',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:name' => 'Név',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:documents_list' => 'Dokumentumok',
-	'Class:Licence/Attribute:documents_list+' => 'A licenc dokumentumai',
-	'Class:Licence/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:organization_name' => 'Szervezeti egység név',
-	'Class:Licence/Attribute:organization_name+' => 'Általános név',
-	'Class:Licence/Attribute:usage_limit' => 'Felhasználási korlátok',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:description' => 'Leírás',
-	'Class:Licence/Attribute:description+' => '~~',
-	'Class:Licence/Attribute:start_date' => 'Kezdő dátum',
-	'Class:Licence/Attribute:start_date+' => '~~',
-	'Class:Licence/Attribute:end_date' => 'Befejező dátum',
-	'Class:Licence/Attribute:end_date+' => '~~',
-	'Class:Licence/Attribute:licence_key' => 'Licenckulcs',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:perpetual' => 'Öröklicenc',
-	'Class:Licence/Attribute:perpetual+' => '~~',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'nem',
-	'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
-	'Class:Licence/Attribute:perpetual/Value:yes' => 'igen',
-	'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
-	'Class:Licence/Attribute:finalclass' => 'Típus',
-	'Class:Licence/Attribute:finalclass+' => 'A végső osztály neve',
+    'Class:Licence' => 'Licenc',
+    'Class:Licence+' => '',
+    'Class:Licence/Attribute:name' => 'Licenc név',
+    'Class:Licence/Attribute:name+' => '',
+    'Class:Licence/Attribute:documents_list' => 'Dokumentumok',
+    'Class:Licence/Attribute:documents_list+' => 'A licenc dokumentumai',
+    'Class:Licence/Attribute:org_id' => 'Tulajdonos szervezeti egység',
+    'Class:Licence/Attribute:org_id+' => '',
+    'Class:Licence/Attribute:organization_name' => 'Szervezeti egység név',
+    'Class:Licence/Attribute:organization_name+' => 'Általános név',
+    'Class:Licence/Attribute:usage_limit' => 'Felhasználási korlátok',
+    'Class:Licence/Attribute:usage_limit+' => '',
+    'Class:Licence/Attribute:description' => 'Leírás',
+    'Class:Licence/Attribute:description+' => '',
+    'Class:Licence/Attribute:start_date' => 'Érvényesség kezdete',
+    'Class:Licence/Attribute:start_date+' => '',
+    'Class:Licence/Attribute:end_date' => 'Érvényesség vége',
+    'Class:Licence/Attribute:end_date+' => '',
+    'Class:Licence/Attribute:licence_key' => 'Licenckulcs',
+    'Class:Licence/Attribute:licence_key+' => '',
+    'Class:Licence/Attribute:perpetual' => 'Öröklicenc',
+    'Class:Licence/Attribute:perpetual+' => '',
+    'Class:Licence/Attribute:perpetual/Value:no' => 'nem',
+    'Class:Licence/Attribute:perpetual/Value:no+' => 'no~~',
+    'Class:Licence/Attribute:perpetual/Value:yes' => 'igen',
+    'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes~~',
+    'Class:Licence/Attribute:finalclass' => 'Licenc típus',
+    'Class:Licence/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
 //
@@ -1108,12 +1108,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Model/Attribute:type/Value:PowerSource+' => 'Áramforrás',
 	'Class:Model/Attribute:type/Value:DiskArray' => 'Lemez tömb',
 	'Class:Model/Attribute:type/Value:DiskArray+' => '',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Készülékház',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
+    'Class:Model/Attribute:type/Value:Enclosure' => 'Beépítőkeret',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
 	'Class:Model/Attribute:type/Value:IPPhone' => 'Egyéb eszköz',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+    'Class:Model/Attribute:type/Value:IPPhone+' => 'pl.IP telefon',
 	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiltelefon',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
 	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
 	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
 	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Hálózati eszköz',
@@ -1143,7 +1143,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Model/Attribute:physicaldevices_list' => 'Fizikai eszközök',
 	'Class:Model/Attribute:physicaldevices_list+' => 'Fizikai eszközök melyek ehhez a modellszámhoz tartoznak',
 	'Class:Model/UniquenessRule:name_brand+' => 'A névnek egyedinek kell lennie a gyártón belül',
-	'Class:Model/UniquenessRule:name_brand' => 'a gyártó ezen modellje már létezik',
+	'Class:Model/UniquenessRule:name_brand' => 'A gyártó ezen modellje már létezik',
 ));
 
 //
@@ -1163,7 +1163,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:IOSVersion' => 'IOS Verzió',
-	'Class:IOSVersion+' => '~~',
+    'Class:IOSVersion+' => 'A hálózati eszköz firmware-je',
 	'Class:IOSVersion/Attribute:brand_id' => 'Gyártó',
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
@@ -1175,12 +1175,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkDocumentToPatch' => 'Dokumentum / Javítócsomag',
+    'Class:lnkDocumentToPatch' => 'Dokumentum / Szervizcsomag',
 	'Class:lnkDocumentToPatch+' => '~~',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Javítócsomag',
+    'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Szervízcsomag',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Javítócsomag név',
+    'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Szervizcsomag név',
 	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '~~',
 	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokumentum',
 	'Class:lnkDocumentToPatch/Attribute:document_id+' => '~~',
@@ -1193,12 +1193,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Szoftverpéldány / Szoftver javítócsomag',
+    'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Szoftverpéldány / Szoftver szervizcsomag',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Szoftver javítócsomag',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Szoftver javítócsomag név',
+    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Szoftver szervizcsomag',
+    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '~~',
+    'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Szoftver szervizcsomag név',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Szoftverpéldány',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '~~',
@@ -1211,12 +1211,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToOSPatch' => 'Funkcionális CI / OS javítócsomag',
+    'Class:lnkFunctionalCIToOSPatch' => 'Funkcionális CI / OS szervizcsomag',
 	'Class:lnkFunctionalCIToOSPatch+' => '~~',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS javítócsomag',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS javítócsomag név',
+    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS szervizcsomag',
+    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '~~',
+    'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS szervizcsomag név',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Funkcionális CI',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '~~',
@@ -1254,17 +1254,17 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Subnet/Attribute:description' => 'Leírás',
 	'Class:Subnet/Attribute:description+' => '',
 	'Class:Subnet/Attribute:subnet_name' => 'Alhálózat név',
-	'Class:Subnet/Attribute:subnet_name+' => '~~',
-	'Class:Subnet/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Név',
+	'Class:Subnet/Attribute:subnet_name+' => '',
+    'Class:Subnet/Attribute:org_id' => 'Tulajdonos szervezeti egység',
+    'Class:Subnet/Attribute:org_id+' => '',
+    'Class:Subnet/Attribute:org_name' => 'Szervezeti egység név',
 	'Class:Subnet/Attribute:org_name+' => 'Általános név',
 	'Class:Subnet/Attribute:ip' => 'IP cím',
 	'Class:Subnet/Attribute:ip+' => '',
 	'Class:Subnet/Attribute:ip_mask' => 'IP netmaszk',
 	'Class:Subnet/Attribute:ip_mask+' => '',
 	'Class:Subnet/Attribute:vlans_list' => 'VLAN-ok',
-	'Class:Subnet/Attribute:vlans_list+' => '~~',
+	'Class:Subnet/Attribute:vlans_list+' => '',
 ));
 
 //
@@ -1278,11 +1278,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:VLAN/Attribute:vlan_tag+' => '~~',
 	'Class:VLAN/Attribute:description' => 'Leírás',
 	'Class:VLAN/Attribute:description+' => '~~',
-	'Class:VLAN/Attribute:org_id' => 'Szervezeti egység',
+    'Class:VLAN/Attribute:org_id' => 'Tulajdonos szervezeti egység',
 	'Class:VLAN/Attribute:org_id+' => '~~',
 	'Class:VLAN/Attribute:org_name' => 'Szervezeti egység név',
 	'Class:VLAN/Attribute:org_name+' => 'Általános név',
-	'Class:VLAN/Attribute:subnets_list' => 'Alhálozatok',
+    'Class:VLAN/Attribute:subnets_list' => 'Alhálózatok',
 	'Class:VLAN/Attribute:subnets_list+' => '~~',
 	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fizikai hálózati csatolók',
 	'Class:VLAN/Attribute:physicalinterfaces_list+' => '~~',
@@ -1317,7 +1317,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Név',
 	'Class:NetworkInterface/Attribute:name+' => '~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Típus',
+    'Class:NetworkInterface/Attribute:finalclass' => 'Hálózati csatoló típus',
 	'Class:NetworkInterface/Attribute:finalclass+' => 'A végső osztály neve',
 ));
 
@@ -1419,7 +1419,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Kapcsolható CI / Hálózati eszköz',
-	'Class:lnkConnectableCIToNetworkDevice+' => '~~',
+    'Class:lnkConnectableCIToNetworkDevice+' => 'Hálózati csatlakozással rendelkező eszközök',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Hálózati eszköz',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '~~',
@@ -1430,15 +1430,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Csatlakoztatott eszköz név',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Hálózati port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Eszköz port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Csatlakozás típus',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'down link',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'down link~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'up link',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'up link~~',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => 'Ennek az eszköznek a hálózat felé',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Eszköz port',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => 'A másik csatlakoztatott eszköz portja',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Csatlakozás típus',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => 'A hálózati topológia iránya az eszközök között',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Bejövő',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'bejövő link',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Kimenő',
+    'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'kimenő link~~',
 ));
 
 //
@@ -1485,7 +1485,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Group' => 'Csoport',
 	'Class:Group+' => '',
 	'Class:Group/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:Group/Attribute:name' => 'Név',
+    'Class:Group/Attribute:name' => 'CI csoport név',
 	'Class:Group/Attribute:name+' => '',
 	'Class:Group/Attribute:status' => 'Állapot',
 	'Class:Group/Attribute:status+' => '',
@@ -1493,24 +1493,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Group/Attribute:status/Value:implementation+' => '',
 	'Class:Group/Attribute:status/Value:obsolete' => 'Elavult',
 	'Class:Group/Attribute:status/Value:obsolete+' => '',
-	'Class:Group/Attribute:status/Value:production' => 'Használatban',
-	'Class:Group/Attribute:status/Value:production+' => '',
-	'Class:Group/Attribute:org_id' => 'Szevezeti egység',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => 'Név',
-	'Class:Group/Attribute:owner_name+' => '',
-	'Class:Group/Attribute:description' => 'Leírás',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Típus',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Fölérendelt csoport',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => 'Név',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => 'Kapcsolódó CI-k',
-	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group~~',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Szülő csoport',
-	'Class:Group/Attribute:parent_id_friendlyname+' => '~~',
+    'Class:Group/Attribute:status/Value:production' => 'Bevezetve',
+    'Class:Group/Attribute:status/Value:production+' => '',
+    'Class:Group/Attribute:org_id' => 'Tulajdonos szervezeti egység',
+    'Class:Group/Attribute:org_id+' => '',
+    'Class:Group/Attribute:owner_name' => 'Tulajdonos név',
+    'Class:Group/Attribute:owner_name+' => '',
+    'Class:Group/Attribute:description' => 'Leírás',
+    'Class:Group/Attribute:description+' => '',
+    'Class:Group/Attribute:type' => 'Típus',
+    'Class:Group/Attribute:type+' => '',
+    'Class:Group/Attribute:parent_id' => 'Fölérendelt csoport',
+    'Class:Group/Attribute:parent_id+' => '',
+    'Class:Group/Attribute:parent_name' => 'Fölérendelt csoport név',
+    'Class:Group/Attribute:parent_name+' => '',
+    'Class:Group/Attribute:ci_list' => 'Kapcsolódó CI-k',
+    'Class:Group/Attribute:ci_list+' => '',
+    'Class:Group/Attribute:parent_id_friendlyname' => 'Fölérendelt csoport név',
+    'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ));
 
 //
@@ -1518,19 +1518,19 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkGroupToCI' => 'Csoport / CI',
+    'Class:lnkGroupToCI' => 'CI csoport / CI',
 	'Class:lnkGroupToCI+' => '',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Csoport',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Név',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Név',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Indoklás',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
+    'Class:lnkGroupToCI/Attribute:group_id' => 'CI csoport',
+    'Class:lnkGroupToCI/Attribute:group_id+' => '',
+    'Class:lnkGroupToCI/Attribute:group_name' => 'CI csoport név',
+    'Class:lnkGroupToCI/Attribute:group_name+' => '',
+    'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+    'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+    'Class:lnkGroupToCI/Attribute:ci_name' => 'CI név',
+    'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+    'Class:lnkGroupToCI/Attribute:reason' => 'Indoklás',
+    'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
 // Add translation for Fieldsets
@@ -1574,49 +1574,48 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Menu:Application' => 'Alkalmazások',
-	'Menu:Application+' => '',
-	'Menu:DBServer' => 'Adatbázis szerverek',
-	'Menu:DBServer+' => '',
-	'Menu:BusinessProcess' => 'Üzleti folyamatok',
-	'Menu:BusinessProcess+' => '',
-	'Menu:ApplicationSolution' => 'Egyedi alkalmazások',
-	'Menu:ApplicationSolution+' => '',
-	'Menu:ConfigManagementSoftware' => 'Alkalmazás kezelés',
-	'Menu:Licence' => 'Licencek',
-	'Menu:Licence+' => '',
-	'Menu:Patch' => 'Frissítések',
-	'Menu:Patch+' => '',
-	'Menu:ApplicationInstance' => 'Telepített szoftverek',
-	'Menu:ApplicationInstance+' => '',
-	'Menu:ConfigManagementHardware' => 'Infrastruktúra kezelés',
-	'Menu:Subnet' => 'Alhálózatok',
-	'Menu:Subnet+' => '',
-	'Menu:NetworkDevice' => 'Hálózati eszközök',
-	'Menu:NetworkDevice+' => '',
-	'Menu:Server' => 'Szerverek',
-	'Menu:Server+' => '',
-	'Menu:Printer' => 'Nyomtatók',
-	'Menu:Printer+' => '',
-	'Menu:MobilePhone' => 'Mobiltelefonok',
-	'Menu:MobilePhone+' => '',
-	'Menu:PC' => 'PC-k',
-	'Menu:PC+' => '',
-	'Menu:NewCI' => 'Új CI',
-	'Menu:NewCI+' => '',
-	'Menu:SearchCIs' => 'CI keresés',
-	'Menu:SearchCIs+' => '',
-	'Menu:ConfigManagement:Devices' => 'Eszközök',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastruktúra',
-	'Menu:ConfigManagement:virtualization' => 'Virtualizáció',
-	'Menu:ConfigManagement:EndUsers' => 'Végfelhasználói eszközök',
-	'Menu:ConfigManagement:SWAndApps' => 'Szoftverek és egyedi alkalmazások',
-	'Menu:ConfigManagement:Misc' => 'Egyéb',
-	'Menu:Group' => 'CI csoportok',
-	'Menu:Group+' => '',
-	'Menu:OSVersion' => 'OS verziók',
-	'Menu:OSVersion+' => '~~',
-	'Menu:Software' => 'Szoftverkatalógus',
-	'Menu:Software+' => 'Software catalog~~',
+    'Menu:Application' => 'Alkalmazások',
+    'Menu:Application+' => '',
+    'Menu:DBServer' => 'Adatbázis szerverek',
+    'Menu:DBServer+' => '',
+    'Menu:BusinessProcess' => 'Üzleti folyamatok',
+    'Menu:BusinessProcess+' => '',
+    'Menu:ApplicationSolution' => 'Alkalmazásmegoldások',
+    'Menu:ApplicationSolution+' => '',
+    'Menu:ConfigManagementSoftware' => 'Alkalmazás kezelés',
+    'Menu:Licence' => 'Licencek',
+    'Menu:Licence+' => '',
+    'Menu:Patch' => 'Szervizcsomagok',
+    'Menu:Patch+' => '',
+    'Menu:ApplicationInstance' => 'Telepített szoftverek',
+    'Menu:ApplicationInstance+' => '',
+    'Menu:ConfigManagementHardware' => 'Infrastruktúra kezelés',
+    'Menu:Subnet' => 'Alhálózatok',
+    'Menu:Subnet+' => '',
+    'Menu:NetworkDevice' => 'Hálózati eszközök',
+    'Menu:NetworkDevice+' => '',
+    'Menu:Server' => 'Szerverek',
+    'Menu:Server+' => '',
+    'Menu:Printer' => 'Nyomtatók',
+    'Menu:Printer+' => '',
+    'Menu:MobilePhone' => 'Mobiltelefonok',
+    'Menu:MobilePhone+' => '',
+    'Menu:PC' => 'PC-k',
+    'Menu:PC+' => '',
+    'Menu:NewCI' => 'Új konfigurációs elem (CI)',
+    'Menu:NewCI+' => 'Eszköz, szoftver, licenc, stb.',
+    'Menu:SearchCIs' => 'CI keresés',
+    'Menu:SearchCIs+' => '',
+    'Menu:ConfigManagement:Devices' => 'Eszközök',
+    'Menu:ConfigManagement:AllDevices' => 'Infrastruktúra',
+    'Menu:ConfigManagement:virtualization' => 'Virtualizáció',
+    'Menu:ConfigManagement:EndUsers' => 'Végfelhasználói eszközök',
+    'Menu:ConfigManagement:SWAndApps' => 'Szoftverek és alkalmazások',
+    'Menu:ConfigManagement:Misc' => 'Egyéb',
+    'Menu:Group' => 'CI csoportok',
+    'Menu:Group+' => '',
+    'Menu:OSVersion' => 'OS verziók',
+    'Menu:OSVersion+' => '',
+    'Menu:Software' => 'Szoftverkatalógus',
+    'Menu:Software+' => 'Szoftverek',
 ));
-?>

datamodels/2.x/itop-config/config.php

@@ -11,6 +11,7 @@ use Combodo\iTop\Application\UI\Base\Component\Form\Form;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
+use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\Config\Validator\iTopConfigAstValidator;
 use Combodo\iTop\Config\Validator\iTopConfigSyntaxValidator;
 

datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php

@@ -49,7 +49,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'iTopUpdate:UI:UploadArchive' => 'Válasszon egy csomagot a feltöltéshez',
 	'iTopUpdate:UI:ServerFile' => 'A kiszolgálón már meglévő csomag elérési útvonala',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'A frissítés során az alkalmazás csak olvasható lesz.',
-	'iTopUpdate:UI:Status' => 'Státusz',
+    'iTopUpdate:UI:Status' => 'Állapotjelentés',
 	'iTopUpdate:UI:Action' => 'Frissítés',
 	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.' Setup~~',
 	'iTopUpdate:UI:History' => 'Verziótörténet',
@@ -69,7 +69,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Az alkalmazás frissíthető',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'Az alkalmazás nem frissíthető: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning'          => 'Figyelem: alkalmazás frissítés sikertelen lehet: %1$s',
-	'iTopUpdate:UI:CannotUpdateUseSetup'           => '<b>SNéhány módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse a <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
+    'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>Néhány manuálisan módosított fájlt észleltünk</b>, a részleges frissítés nem hajtható végre.</br>Kövesse ezt az <a target="_blank" href="%2$s"> eljárást</a> az iTop manuális frissítéséhez. Az alkalmazás frissítéséhez a <a href="%1$s">setup</a> parancsot kell használnia.',
 	'iTopUpdate:UI:CheckInProgress'                => 'Kérjük, várjon az integritás ellenőrzés alatt',
 	'iTopUpdate:UI:SetupLaunch'                    => 'Launch '.ITOP_APPLICATION_SHORT.' Setup~~',
 	'iTopUpdate:UI:SetupLaunchConfirm'             => 'This will launch '.ITOP_APPLICATION_SHORT.' setup, are you sure?~~',
@@ -111,5 +111,3 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ModuleInstallation/Attribute:version'   => 'Verzió',
 	'Class:ModuleInstallation/Attribute:comment' => 'Megjegyzés',
 ));
-
-

datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php

@@ -23,23 +23,23 @@
 // Class: FAQ
 //
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQ' => 'Tudástár',
-	'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
-	'Class:FAQ/Attribute:title' => 'Cím',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Összefoglaló',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Leírás',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Kategória',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Kategória név',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Hibakód',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Hibatartomány',
+    'Class:FAQ' => 'Tudástár',
+    'Class:FAQ+' => 'Gyakran Ismételt Kérdések',
+    'Class:FAQ/Attribute:title' => 'Cím',
+    'Class:FAQ/Attribute:title+' => 'A tudástár címe',
+    'Class:FAQ/Attribute:summary' => 'Összefoglaló',
+    'Class:FAQ/Attribute:summary+' => 'Egy rövid leírás a témáról',
+    'Class:FAQ/Attribute:description' => 'Leírás',
+    'Class:FAQ/Attribute:description+' => 'Maga a tudástár cikk',
+    'Class:FAQ/Attribute:category_id' => 'Kategória',
+    'Class:FAQ/Attribute:category_id+' => '~~',
+    'Class:FAQ/Attribute:category_name' => 'Kategória név',
+    'Class:FAQ/Attribute:category_name+' => '~~',
+    'Class:FAQ/Attribute:error_code' => 'Hibakód',
+    'Class:FAQ/Attribute:error_code+' => '~~',
+    'Class:FAQ/Attribute:key_words' => 'Kulcsszavak',
+    'Class:FAQ/Attribute:key_words+' => 'A keresést segítő kulcsszavak',
+    'Class:FAQ/Attribute:domains' => 'Hibatartomány',
 ));
 
 //
@@ -47,22 +47,22 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQCategory' => 'Tudástár kategória',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Név',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+    'Class:FAQCategory' => 'Tudástár kategória',
+    'Class:FAQCategory+' => '',
+    'Class:FAQCategory/Attribute:name' => 'Kategória név',
+    'Class:FAQCategory/Attribute:name+' => '~~',
+    'Class:FAQCategory/Attribute:faq_list' => 'Tudástárak',
+    'Class:FAQCategory/Attribute:faq_list+' => 'Gyakori kérdések ehhez a kategóriához kapcsolódóan',
 ));
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Menu:ProblemManagement' => 'Problémakezelés',
-	'Menu:ProblemManagement+' => '',
-	'Menu:Problem:Shortcuts' => 'Gyorsgombok',
-	'Menu:FAQCategory' => 'Tudástár kategória',
-	'Menu:FAQCategory+' => 'Összes tudástár kategória',
-	'Menu:FAQ' => 'Tudástár',
-	'Menu:FAQ+' => 'Összes tudástár',
-	'Brick:Portal:FAQ:Menu' => 'Tudástár',
-	'Brick:Portal:FAQ:Title' => 'Tudástárak',
-	'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
+    'Menu:ProblemManagement' => 'Problémakezelés',
+    'Menu:ProblemManagement+' => '',
+    'Menu:Problem:Shortcuts' => 'Gyorsgombok',
+    'Menu:FAQCategory' => 'Tudástár kategória',
+    'Menu:FAQCategory+' => 'Tudástár kategóriák',
+    'Menu:FAQ' => 'Tudástár',
+    'Menu:FAQ+' => 'Meglévő tudástárak',
+    'Brick:Portal:FAQ:Menu' => 'Tudástár',
+    'Brick:Portal:FAQ:Title' => 'Tudástárak',
+    'Brick:Portal:FAQ:Title+' => '<p>Siet?</p><p>Nézze át a leggyakoribb kérdések listáját, és (talán) azonnal megtalálja a keresett választ.</p>',
 ));

datamodels/2.x/itop-hub-connector/ajax.php

@@ -23,6 +23,8 @@
  * @license http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\WebPage\AjaxPage;
+
 require_once(APPROOT.'application/utils.inc.php');
 require_once(APPROOT.'core/log.class.inc.php');
 IssueLog::Enable(APPROOT.'log/error.log');

datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Mit dem iTop Hub verbinden',
 	'Menu:iTopHub:Register+' => ITOP_APPLICATION_SHORT.'-Instanzen über den iTop Hub updaten',
-	'Menu:iTopHub:Register:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!</br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.</br><br/>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!<br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.<br><br>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Installierte Erweiterungen',
 	'Menu:iTopHub:MyExtensions+' => 'Liste der auf ihrer '.ITOP_APPLICATION_SHORT.' Instanz installierten Erweiterungen',
 	'Menu:iTopHub:BrowseExtensions' => 'Erweiterungen vom iTop Hub beziehen',
 	'Menu:iTopHub:BrowseExtensions+' => 'Mehr Erweiterungen auf dem iTop Hub entdecken',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!</br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.</br><br/>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Zugriff auf die Community-Plattform iTop Hub!<br>Hier finden sie Informationen zu ihren '.ITOP_APPLICATION_SHORT.' Instanzen, können diese mit personalisierten Tools verwalten und sich Erweiterungen installieren.<br><br>Durch die Verbindung mit dem iTop Hub, werden Informationen zu Ihrer '.ITOP_APPLICATION_SHORT.' Instanz zum iTop Hub übertragen.</p>',
 	'iTopHub:GoBtn' => 'Gehe zum iTop Hub',
 	'iTopHub:CloseBtn' => 'Schließen',
 	'iTopHub:GoBtn:Tooltip' => 'Gehe zu www.itophub.io',
@@ -45,7 +45,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'iTopHub:Landing:Status' => 'Installationsstatus',
 	'iTopHub:Landing:Install' => 'Erweiterungen werden installiert...',
 	'iTopHub:CompiledOK' => 'Installation erfolgreich',
-	'iTopHub:ConfigurationSafelyReverted' => 'Fehler während der Installation!<br/>'.ITOP_APPLICATION_SHORT.' Konfiguration wurde NICHT angepasst.',
+	'iTopHub:ConfigurationSafelyReverted' => 'Fehler während der Installation!<br>'.ITOP_APPLICATION_SHORT.' Konfiguration wurde NICHT angepasst.',
 	'iTopHub:FailAuthent' => 'Die Authentifizierung für diese Aktion ist fehlgeschlagen.',
 	'iTopHub:InstalledExtensions' => 'Erweiterungen, die auf dieser Instanz installiert sind',
 	'iTopHub:ExtensionCategory:Manual' => 'Manuell installierte Erweiterungen',

datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php

@@ -26,12 +26,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub',
 	'iTopHub:CloseBtn' => 'Close',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io',
@@ -47,7 +47,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'iTopHub:Landing:Status' => 'Deployment status',
 	'iTopHub:Landing:Install' => 'Deploying extensions...',
 	'iTopHub:CompiledOK' => 'Compilation successful.',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.',
 
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance',

datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php

@@ -26,12 +26,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Conectar a iTop Hub',
 	'Menu:iTopHub:Register+' => 'Ir a iTop Hub para actualizar su instancia de '.ITOP_APPLICATION_SHORT,
-	'Menu:iTopHub:Register:Description' => '<p>Obtenga acceso a la plataforma comunitaria iTop Hub!</br>Encuentre todo el contenido e información que necesite, adminitre sus instancias a través de herramientas personalizadas e instale más extensiones.</br><br/>Mediante la conexión al Hub desde esta página, usted compartirá información acerca de esta instancia de '.ITOP_APPLICATION_SHORT.' en el Hub.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Obtenga acceso a la plataforma comunitaria iTop Hub!<br>Encuentre todo el contenido e información que necesite, adminitre sus instancias a través de herramientas personalizadas e instale más extensiones.<br><br>Mediante la conexión al Hub desde esta página, usted compartirá información acerca de esta instancia de '.ITOP_APPLICATION_SHORT.' en el Hub.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Extensiones instaladas',
 	'Menu:iTopHub:MyExtensions+' => 'Vea la lista de extensiones instalada en esta instancia de '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Obtener extensiones de iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Navegue por más extensiones en iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Vea en "iTop Hub’s store", su único lugar para encontrar extensiones de '.ITOP_APPLICATION_SHORT.'.</br>Encuentre aquellas que le ayuden a personalizar y adaptar '.ITOP_APPLICATION_SHORT.' a sus procesos.</br><br/>Mediante la conexión al Hub desde esta página, usted compartirá información acerca de esta instancia de '.ITOP_APPLICATION_SHORT.' en el Hub.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Vea en "iTop Hub’s store", su único lugar para encontrar extensiones de '.ITOP_APPLICATION_SHORT.'.<br>Encuentre aquellas que le ayuden a personalizar y adaptar '.ITOP_APPLICATION_SHORT.' a sus procesos.<br><br>Mediante la conexión al Hub desde esta página, usted compartirá información acerca de esta instancia de '.ITOP_APPLICATION_SHORT.' en el Hub.</p>',
 	'iTopHub:GoBtn' => 'Ir a iTop Hub',
 	'iTopHub:CloseBtn' => 'Cerrar',
 	'iTopHub:GoBtn:Tooltip' => 'Ir a www.itophub.io',
@@ -46,7 +46,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopHub:Landing:Status' => 'Estatus de Instalación',
 	'iTopHub:Landing:Install' => 'Instalando extensiones...',
 	'iTopHub:CompiledOK' => 'Compilación éxitosa.',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detectado durante la instalación!<br/>La configuración de '.ITOP_APPLICATION_SHORT.' NO fue modificada.',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detectado durante la instalación!<br>La configuración de '.ITOP_APPLICATION_SHORT.' NO fue modificada.',
 	'iTopHub:FailAuthent' => 'Autenticación fallida para esta acciónn.',
 	'iTopHub:InstalledExtensions' => 'Extensiones instaladas en esta instancia',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensiones instaladas manualmente',

datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php

@@ -10,12 +10,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Se connecter à iTop Hub',
 	'Menu:iTopHub:Register+' => 'Connectez-vous à iTop Hub pour enregistrer cette instance d\''.ITOP_APPLICATION_SHORT,
-	'Menu:iTopHub:Register:Description' => '<p>Connectez-vous à la communauté iTop Hub!</br>Trouvez tout le contenu dont vous avez besoin, gérer vos instances d\'iTop depuis un tableau de bord centralisé et déployez de nouvelles extensions.</br><br/>En vous connectant au Hub depuis cette page, vous transmettez au Hub des informations relatives à cette instance d\''.ITOP_APPLICATION_SHORT.'.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Connectez-vous à la communauté iTop Hub!<br>Trouvez tout le contenu dont vous avez besoin, gérer vos instances d\'iTop depuis un tableau de bord centralisé et déployez de nouvelles extensions.<br><br>En vous connectant au Hub depuis cette page, vous transmettez au Hub des informations relatives à cette instance d\''.ITOP_APPLICATION_SHORT.'.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Extensions déployées',
 	'Menu:iTopHub:MyExtensions+' => 'Voir la liste des extensions déployes sur cette instance',
 	'Menu:iTopHub:BrowseExtensions' => 'Obtenir des extensions depuis iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Parcourir la listes des extensions disponibles sur iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Découvrez le magasin d\'extensions iTop Hub !</br>Trouvez en quelques clics celles qui vous permettront de construire un iTop sur mesure qui se conforme à vos processus.</br><br/>En vous connectant au Hub depuis cette page, vous transmettez au Hub des informations relatives à cette instance d\''.ITOP_APPLICATION_SHORT.'.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Découvrez le magasin d\'extensions iTop Hub !<br>Trouvez en quelques clics celles qui vous permettront de construire un iTop sur mesure qui se conforme à vos processus.<br><br>En vous connectant au Hub depuis cette page, vous transmettez au Hub des informations relatives à cette instance d\''.ITOP_APPLICATION_SHORT.'.</p>',
 	'iTopHub:GoBtn' => 'Aller sur iTop Hub',
 	'iTopHub:CloseBtn' => 'Fermer',
 	'iTopHub:GoBtn:Tooltip' => 'Naviguer vers www.itophub.io',
@@ -30,7 +30,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'iTopHub:Landing:Status' => 'Etat du déploiement',
 	'iTopHub:Landing:Install' => 'Déploiement des extensions...',
 	'iTopHub:CompiledOK' => 'Compilation réussie.',
-	'iTopHub:ConfigurationSafelyReverted' => 'Une erreur a été détectée durant le déploiement!<br/>La configuration d\'iTop n\'a PAS été modifiée.',
+	'iTopHub:ConfigurationSafelyReverted' => 'Une erreur a été détectée durant le déploiement!<br>La configuration d\'iTop n\'a PAS été modifiée.',
 	'iTopHub:FailAuthent' => 'Échec d\'authentification pour cette action',
 	'iTopHub:InstalledExtensions' => 'Extensions déployées sur cette instance',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions déployées manuellement',

datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php

@@ -77,5 +77,3 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'iTopHub:InstallationStatus:Installed' => 'Telepítve',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'A %1$s verzió <b>NINCS</b> telepítve.',
 ));
-
-

datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your iTop instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !</br>Find the ones that will help you customize and adapt iTop to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt iTop to your processes.<br><br>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>iTop configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>iTop configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php

@@ -26,12 +26,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Verbinding maken met iTop Hub',
 	'Menu:iTopHub:Register+' => 'Ga naar de iTop Hub om je iTop bij te werken.',
-	'Menu:iTopHub:Register:Description' => '<p>Verkrijg toegang tot jouw iTop Hub (community platform)!</br>Je vindt er alle informatie die je nodig hebt. Je kan je omgevingen beheren met gepersonaliseerde tools en extensies.</br><br/>Door van hieruit te verbinden met de Hub, stuur je informatie over deze '.ITOP_APPLICATION_SHORT.'-omgeving naar de Hub.</p>',
+	'Menu:iTopHub:Register:Description' => '<p>Verkrijg toegang tot jouw iTop Hub (community platform)!<br>Je vindt er alle informatie die je nodig hebt. Je kan je omgevingen beheren met gepersonaliseerde tools en extensies.<br><br>Door van hieruit te verbinden met de Hub, stuur je informatie over deze '.ITOP_APPLICATION_SHORT.'-omgeving naar de Hub.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Mijn extensies',
 	'Menu:iTopHub:MyExtensions+' => 'Bekijk de lijst van extensies die je gebruikt in deze '.ITOP_APPLICATION_SHORT.'-omgeving.',
 	'Menu:iTopHub:BrowseExtensions' => 'Vind extensies op iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Blader door de extensiecatalogus op iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>In de iTop Hub Store vind je heel wat extensies!</br>Blader door de catalogus en ontdek welke extensies jou helpen om iTop aan te passen aan jouw manier van werken.</br><br/>Door van hieruit te verbinden met de Hub, stuur je informatie over deze '.ITOP_APPLICATION_SHORT.'-omgeving naar de Hub.</p>',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>In de iTop Hub Store vind je heel wat extensies!<br>Blader door de catalogus en ontdek welke extensies jou helpen om iTop aan te passen aan jouw manier van werken.<br><br>Door van hieruit te verbinden met de Hub, stuur je informatie over deze '.ITOP_APPLICATION_SHORT.'-omgeving naar de Hub.</p>',
 	'iTopHub:GoBtn' => 'Ga naar iTop Hub',
 	'iTopHub:CloseBtn' => 'Sluiten',
 	'iTopHub:GoBtn:Tooltip' => 'Ga naar www.itophub.io',
@@ -46,7 +46,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'iTopHub:Landing:Status' => 'Installatiestatus',
 	'iTopHub:Landing:Install' => 'Bezig met extensies te installeren...',
 	'iTopHub:CompiledOK' => 'Compilatie geslaagd.',
-	'iTopHub:ConfigurationSafelyReverted' => 'Er trad een fout op bij de installatie!<br/>'.ITOP_APPLICATION_SHORT.'-configuratie werd NIET aangepast.',
+	'iTopHub:ConfigurationSafelyReverted' => 'Er trad een fout op bij de installatie!<br>'.ITOP_APPLICATION_SHORT.'-configuratie werd NIET aangepast.',
 	'iTopHub:FailAuthent' => 'Aanmelden lukt niet voor deze actie.',
 	'iTopHub:InstalledExtensions' => 'Manueel geïnstalleerde extensies',
 	'iTopHub:ExtensionCategory:Manual' => 'Manueel geïnstalleerde extensies',

datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php

@@ -13,12 +13,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Подключение к iTop Hub',
 	'Menu:iTopHub:Register+' => 'Перейдите в iTop Hub, чтобы обновить ваш экземпляр '.ITOP_APPLICATION_SHORT,
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Установленные расширения',
 	'Menu:iTopHub:MyExtensions+' => 'Расширения, развернутые на данном экземпляре '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Получить расширения из iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Найдите дополнительные расширения на iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -33,7 +33,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php

@@ -25,12 +25,12 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
 	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!</br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !</br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.</br><br/>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br/>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',

datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php

@@ -1,4 +1,7 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\NiceWebPage;
+
 require_once(APPROOT."/application/user.preferences.class.inc.php");
 
 class HubConnectorPage extends NiceWebPage
@@ -8,7 +11,7 @@ class HubConnectorPage extends NiceWebPage
 		parent::__construct($sTitle);
 
 		$this->no_cache();
-		$this->add_xframe_options();
+		$this->add_http_headers();
 
 		$sImagesDir = utils::GetAbsoluteUrlAppRoot().'images';
 		$sModuleImagesDir = utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/images';

datamodels/2.x/itop-hub-connector/land.php

@@ -1,4 +1,8 @@
 <?php
+
+use Combodo\iTop\Application\WebPage\ErrorPage;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 function DisplayStatus(WebPage $oPage)
 {
 	$oPage->set_title(Dict::S('iTopHub:Landing:Status'));