N°7726 - Fatal error if a newsroom is sent without any message

Finalization of tests

.doc/README.md

@@ -79,6 +79,8 @@ Then, **for a method** of an eligible class:
 
 ## Installation
 
+Note : PHP7 is required. Migrating to PHP8 requires some additional work which is questionable as an alternative way to generate a documentation is being considered.
+
 ```
 cd .doc
 composer require phpdocumentor/phpdocumentor:~2 --dev

README.md

@@ -90,6 +90,7 @@ We would like to give a special thank you 🤗 to the people from the community
 - Dejin, Bie (a.k.a [@bdejin](https://github.com/bdejin))
 - Dvořák, Lukáš
 - Goethals, Stefan
+- Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
 - Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
 - Kaltefleiter, Lars (a.k.a [@larhip](https://www.github.com/larhip))

application/cmdbabstract.class.inc.php

@@ -805,16 +805,16 @@ HTML
 		if (!$this->IsNew()) {
 			// Look for any trigger that considers this object as "In Scope"
 			// If any trigger has been found then display a tab with notifications
-			//
+			// If all triggers on an object have been deleted, we consider that we no longer need the event notification information
 			$aTriggers = $this->GetRelatedTriggersIDs();
 			if (count($aTriggers) > 0) {
 				$iId = $this->GetKey();
-				$aParams = array('triggers' => $aTriggers, 'id' => $iId);
+				$aParams = array('class' => get_class($this), 'id' => $iId);
 				$aNotifSearches = array();
 				$iNotifsCount = 0;
 				$aNotificationClasses = MetaModel::EnumChildClasses('EventNotification');
 				foreach ($aNotificationClasses as $sNotifClass) {
-					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev JOIN Trigger AS T ON Ev.trigger_id = T.id WHERE T.id IN (:triggers) AND Ev.object_id = :id");
+					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev WHERE Ev.object_id = :id AND Ev.object_class = :class");
 					$aNotifSearches[$sNotifClass]->SetInternalParams($aParams);
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array());
 					$iNotifsCount += $oNotifSet->Count();

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -45,7 +45,7 @@
       <properties>
         <comment>/** Acknowledge welcome popup messages */</comment>
         <abstract>false</abstract>
-        <category></category>
+        <category/>
         <key_type>autoincrement</key_type>
         <db_table>priv_welcome_popup_acknowledge</db_table>
       </properties>

application/excelexporter.class.inc.php

@@ -303,7 +303,7 @@ class ExcelExporter
 	{
 		if ($this->sOutputFilePath == null)
 		{
-			return APPROOT.'data/bulk_export/'.$this->sToken.'.xlsx';
+			return utils::GetDataPath().'bulk_export/'.$this->sToken.'.xlsx';
 		}
 		else
 		{
@@ -313,14 +313,14 @@ class ExcelExporter
 	
 	public static function GetExcelFileFromToken($sToken)
 	{
-		return @file_get_contents(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
+		return @file_get_contents(utils::GetDataPath().'bulk_export/'.$sToken.'.xlsx');
 	}
 	
 	public static function CleanupFromToken($sToken)
 	{
-		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.status');
-		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.data');
-		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
+		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.status');
+		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.data');
+		@unlink(utils::GetDataPath().'bulk_export/'.$sToken.'.xlsx');
 	}
 	
 	public function Cleanup()
@@ -334,7 +334,7 @@ class ExcelExporter
 	 */
 	public static function CleanupOldFiles()
 	{
-		$aFiles = glob(APPROOT.'data/bulk_export/*.*');
+		$aFiles = glob(utils::GetDataPath().'bulk_export/*.*');
 		$iDelay = MetaModel::GetConfig()->Get('xlsx_exporter_cleanup_old_files_delay');
 		
 		if($iDelay > 0)
@@ -416,14 +416,14 @@ class ExcelExporter
 	
 	protected function CheckDataDir()
 	{
-		if(!is_dir(APPROOT."data/bulk_export"))
+		if(!is_dir(utils::GetDataPath()."bulk_export"))
 		{
-			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
+			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(APPROOT."data/bulk_export"))
+		if (!is_writable(utils::GetDataPath()."bulk_export"))
 		{
-			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
+			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
 		}
 	}
 	
@@ -433,12 +433,12 @@ class ExcelExporter
 		{
 			$sToken = $this->sToken;
 		}
-		return APPROOT."data/bulk_export/$sToken.status";
+		return utils::GetDataPath()."bulk_export/$sToken.status";
 	}
 	
 	protected function GetDataFile()
 	{
-		return APPROOT.'data/bulk_export/'.$this->sToken.'.data';
+		return utils::GetDataPath().'bulk_export/'.$this->sToken.'.data';
 	}
 	
 	protected function GetNewToken()

application/transaction.class.inc.php

@@ -228,7 +228,7 @@ class privUITransactionFile
 	 */
 	public static function GetNewTransactionId()
 	{
-		if (!is_dir(APPROOT.'data/transactions'))
+		if (!is_dir(utils::GetDataPath().'transactions'))
 		{
 			if (!is_writable(APPROOT.'data'))
 			{
@@ -236,22 +236,22 @@ class privUITransactionFile
 			}
 			// condition avoids race condition N°2345
 			// See https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
-			if (!mkdir($concurrentDirectory = APPROOT.'data/transactions') && !is_dir($concurrentDirectory))
+			if (!mkdir($concurrentDirectory = utils::GetDataPath().'transactions') && !is_dir($concurrentDirectory))
 			{
-				throw new Exception('Failed to create the directory "'.APPROOT.'data/transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
+				throw new Exception('Failed to create the directory "'.utils::GetDataPath().'transactions". Ajust the rights on the parent directory or let an administrator create the transactions directory and give the web sever enough rights to write into it.');
 			}
 		}
 
-		if (!is_writable(APPROOT.'data/transactions'))
+		if (!is_writable(utils::GetDataPath().'transactions'))
 		{
-			throw new Exception('The directory "'.APPROOT.'data/transactions" must be writable to the application.');
+			throw new Exception('The directory "'.utils::GetDataPath().'transactions" must be writable to the application.');
 		}
 
 		$iCurrentUserId = static::GetCurrentUserId();
 
 		self::CleanupOldTransactions();
 
-		$sTransactionIdFullPath = tempnam(APPROOT.'data/transactions', static::GetUserPrefix());
+		$sTransactionIdFullPath = tempnam(utils::GetDataPath().'transactions', static::GetUserPrefix());
 		file_put_contents($sTransactionIdFullPath, $iCurrentUserId, LOCK_EX);
 
 		$sTransactionIdFileName = basename($sTransactionIdFullPath);
@@ -274,8 +274,8 @@ class privUITransactionFile
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
-		// Constraint the transaction file within APPROOT.'data/transactions'
-		$sTransactionDir = realpath(APPROOT.'data/transactions');
+		// Constraint the transaction file within utils::GetDataPath().'transactions'
+		$sTransactionDir = realpath(utils::GetDataPath().'transactions');
 		$sFilepath = utils::RealPath($sTransactionDir.'/'.$id, $sTransactionDir);
 		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath)))
 		{
@@ -348,7 +348,7 @@ class privUITransactionFile
 
 		clearstatcache();
 		$iLimit = time() - 24*3600;
-		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : APPROOT.'data/transactions/*';
+		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : utils::GetDataPath().'transactions/*';
 		$aTransactions = glob($sPattern);
 		foreach($aTransactions as $sFileName)
 		{
@@ -368,7 +368,7 @@ class privUITransactionFile
 	{
 		clearstatcache();
 		$aResult = array();
-		$aTransactions = glob(APPROOT.'data/transactions/'.self::GetUserPrefix().'*');
+		$aTransactions = glob(utils::GetDataPath().'transactions/'.self::GetUserPrefix().'*');
 		foreach($aTransactions as $sFileName)
 		{
 			$aResult[] = date('Y-m-d H:i:s', filemtime($sFileName)).' - '.basename($sFileName);

approot.inc.php

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
  *
  * @see ITOP_CORE_VERSION to get full iTop core version
  */
-define('ITOP_DESIGN_LATEST_VERSION', '3.2');
+define('ITOP_DESIGN_LATEST_VERSION', '3.3');
 
 /**
  * Constant containing the iTop core version, whatever application was built
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.2');
  * @used-by utils::GetItopVersionWikiSyntax()
  * @used-by iTopModulesPhpVersionIntegrationTest
  */
-define('ITOP_CORE_VERSION', '3.2.0');
+define('ITOP_CORE_VERSION', '3.3.0');
 
 /**
  * @var string

core/action.class.inc.php

@@ -566,6 +566,7 @@ class ActionEmail extends ActionNotification
 			$oLog->Set('trigger_id', $oTrigger->GetKey());
 			$oLog->Set('action_id', $this->GetKey());
 			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
+            $oLog->Set('object_class', get_class($aContextArgs['this->object()']));
 			// Must be inserted now so that it gets a valid id that will make the link
 			// between an eventual asynchronous task (queued) and the log
 			$oLog->DBInsertNoReload();

core/bulkexport.class.inc.php

@@ -474,14 +474,14 @@ abstract class BulkExport
 	 */
 	protected function MakeTmpFile($sExtension)
 	{
-		if(!is_dir(APPROOT."data/bulk_export"))
+		if(!is_dir(utils::GetDataPath()."bulk_export"))
 		{
-			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
+			@mkdir(utils::GetDataPath()."bulk_export", 0777, true /* recursive */);
 			clearstatcache();
 		}
-		if (!is_writable(APPROOT."data/bulk_export"))
+		if (!is_writable(utils::GetDataPath()."bulk_export"))
 		{
-			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
+			throw new Exception('Data directory "'.utils::GetDataPath().'bulk_export" could not be written.');
 		}
 
 		$iNum = rand();
@@ -489,7 +489,7 @@ abstract class BulkExport
 		{
 			$iNum++;
 			$sToken = sprintf("%08x", $iNum);
-			$sFileName = APPROOT."data/bulk_export/$sToken.".$sExtension;
+			$sFileName = utils::GetDataPath()."bulk_export/$sToken.".$sExtension;
 			$hFile = @fopen($sFileName, 'x');
 		}
 		while($hFile === false);

core/config.class.inc.php

@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
  *
  * @see ITOP_CORE_VERSION to get iTop core version
  */
-define('ITOP_VERSION', '3.2.0-dev');
+define('ITOP_VERSION', '3.3.0-dev');
 
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');

core/datamodel.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -99,7 +99,7 @@
       </presentation>
       <methods/>
     </class>
-    <class id="ActionNewsroom"  _delta="define">
+    <class id="ActionNewsroom" _delta="define">
       <php_parent>
         <name>ActionNotification</name>
       </php_parent>
@@ -148,7 +148,7 @@
           <display_max_height>96</display_max_height>
           <storage_max_width>256</storage_max_width>
           <storage_max_height>256</storage_max_height>
-          <default_image />
+          <default_image/>
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -183,7 +183,7 @@
         </field>
         <field id="url" xsi:type="AttributeString">
           <sql>url</sql>
-          <default_value>$this->url()$</default_value>
+          <default_value>$this-&gt;url()$</default_value>
           <is_null_allowed>false</is_null_allowed>
         </field>
       </fields>
@@ -355,21 +355,37 @@
       }
     }
 
-		if ($bIsAsync === true) {
-		    AsyncSendNewsroom::AddToQueue($this->GetKey(), $oTrigger->GetKey(), $aRecipientsIds, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
-    } else {
-      foreach ($aRecipientsIds as $iRecipientId) {
-        $oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
-          $oEvent->DBInsertNoReload();
-      }
-    }
+		try {
+			if ($bIsAsync === true) {
+				AsyncSendNewsroom::AddToQueue($this->GetKey(), $oTrigger->GetKey(), $aRecipientsIds, $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+			} else {
+				foreach ($aRecipientsIds as $iRecipientId) {
+					$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this, $iRecipientId, $oTrigger->GetKey(), $sMessage, $sTitle, $sUrl, $iObjectId, $sObjectClass);
+					$oEvent->DBInsertNoReload();
+				}
+			}
+		} catch (CoreCannotSaveObjectException $e) {
+			ExceptionLog::LogException($e);
+			foreach($aRecipientsIds as $iRecipientId) {
+				$oEvent = Combodo\iTop\Service\Notification\Event\EventNotificationNewsroomService::MakeEventFromAction($this,
+					$iRecipientId,
+					$oTrigger->GetKey(),
+					Dict::S('Core:EventNotificationNewsroom:ErrorOnDBInsert'),
+					Dict::S('Core:EventNotificationNewsroom:ErrorNotificationNotSent'),
+					$sUrl,
+					$iObjectId,
+					$sObjectClass
+				);
+				$oEvent->DBInsertNoReload();
+			}
+		}
 
 		$this->SetNotificationLanguage($sPreviousLanguage, $aPreviousPluginProperties['language_code'] ?? null);
 	}
 ]]></code>
         </method>
         <method id="GetAsynchronousGlobalSetting">
-          <comment></comment>
+          <comment/>
           <static>true</static>
           <access>public</access>
           <code><![CDATA[
@@ -381,7 +397,7 @@
         </method>
       </methods>
     </class>
-    <class id="EventNotificationNewsroom"  _delta="define">
+    <class id="EventNotificationNewsroom" _delta="define">
       <php_parent>
         <name>EventNotification</name>
       </php_parent>
@@ -405,7 +421,7 @@
         </reconciliation>
         <order>
           <columns>
-            <column id="date" ascending="false" />
+            <column id="date" ascending="false"/>
           </columns>
         </order>
       </properties>
@@ -419,7 +435,7 @@
           <sql>icon</sql>
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
-          <default_image />
+          <default_image/>
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -501,14 +517,14 @@
           </items>
         </details>
         <summary>
-        <items>
-          <item id="date">
-            <rank>10</rank>
-          </item>
-          <item id="message">
-            <rank>20</rank>
-          </item>
-        </items>
+          <items>
+            <item id="date">
+              <rank>10</rank>
+            </item>
+            <item id="message">
+              <rank>20</rank>
+            </item>
+          </items>
         </summary>
         <list>
           <items>

core/dbsearch.class.php

@@ -1552,13 +1552,13 @@ abstract class DBSearch
 		}
 
 		$sLogFile = 'queries.latest';
-		file_put_contents(APPROOT.'data/'.$sLogFile.'.html', $sHtml);
+		file_put_contents(utils::GetDataPath().$sLogFile.'.html', $sHtml);
 
 		$sLog = "<?php\n\$aQueriesLog = ".var_export(self::$m_aQueriesLog, true).";";
-		file_put_contents(APPROOT.'data/'.$sLogFile.'.log', $sLog);
+		file_put_contents(utils::GetDataPath().$sLogFile.'.log', $sLog);
 
 		// Cumulate the queries
-		$sAllQueries = APPROOT.'data/queries.log';
+		$sAllQueries = utils::GetDataPath().'queries.log';
 		if (file_exists($sAllQueries))
 		{
 			// Merge the new queries into the existing log

core/event.class.inc.php

@@ -131,7 +131,7 @@ class EventNotification extends Event
 			"db_finalclass_field" => "",
 			"order_by_default" => array('date' => false),
 			'indexes' => array(
-				array('object_id'),
+				array( 'object_class', 'object_id'),
 			)
 		);
 		MetaModel::Init_Params($aParams);
@@ -139,9 +139,11 @@ class EventNotification extends Event
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass" => "Action", "jointype" => "", "allowed_values" => null, "sql" => "action_id", "is_null_allowed" => false, "on_target_delete" => DEL_AUTO, "depends_on" => array())));
 		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values" => null, "sql" => "object_id", "default_value" => 0, "is_null_allowed" => false, "depends_on" => array())));
+        //@since 3.2.0
+        MetaModel::Init_AddAttribute(new AttributeClass("object_class", array("class_category"=>"", "more_values"=>"", "sql"=>"object_class", "default_value"=>null, "is_null_allowed"=>true /*to avoid setting AbstractResource as default in database*/, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_class', 'object_id')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -176,7 +178,7 @@ class EventNotificationEmail extends EventNotification
 		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_class', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
 
 		// Search criteria

core/simplegraph.class.inc.php

@@ -500,17 +500,17 @@ EOF
 		if (file_exists($sDotExecutable))
 		{
 			// create the file with Graphviz
-			if (!is_dir(APPROOT."data"))
+			if (!is_dir(utils::GetDataPath()))
 			{
-				@mkdir(APPROOT."data");
+				@mkdir(utils::GetDataPath());
 			}
-			if (!is_dir(APPROOT."data/tmp"))
+			if (!is_dir(utils::GetDataPath()."tmp"))
 			{
-				@mkdir(APPROOT."data/tmp");
+				@mkdir(utils::GetDataPath()."tmp");
 			}
-			$sImageFilePath = tempnam(APPROOT."data/tmp", 'png-');
+			$sImageFilePath = tempnam(utils::GetDataPath()."tmp", 'png-');
 			$sDotDescription = $this->GetDotDescription();
-			$sDotFilePath = tempnam(APPROOT."data/tmp", 'dot-');
+			$sDotFilePath = tempnam(utils::GetDataPath()."tmp", 'dot-');
 		
 			$rFile = @fopen($sDotFilePath, "w");
 			@fwrite($rFile, $sDotDescription);
@@ -556,17 +556,17 @@ EOF
 		if (file_exists($sDotExecutable))
 		{
 			// create the file with Graphviz
-			if (!is_dir(APPROOT."data"))
+			if (!is_dir(utils::GetDataPath()))
 			{
-				@mkdir(APPROOT."data");
+				@mkdir(utils::GetDataPath());
 			}
-			if (!is_dir(APPROOT."data/tmp"))
+			if (!is_dir(utils::GetDataPath()."tmp"))
 			{
-				@mkdir(APPROOT."data/tmp");
+				@mkdir(utils::GetDataPath()."tmp");
 			}
-			$sXdotFilePath = tempnam(APPROOT."data/tmp", 'xdot-');
+			$sXdotFilePath = tempnam(utils::GetDataPath()."tmp", 'xdot-');
 			$sDotDescription = $this->GetDotDescription(true); // true => don't put (localized) labels in the file, since it makes it harder to parse
-			$sDotFilePath = tempnam(APPROOT."data/tmp", 'dot-');
+			$sDotFilePath = tempnam(utils::GetDataPath()."tmp", 'dot-');
 	
 			$rFile = @fopen($sDotFilePath, "w");
 			@fwrite($rFile, $sDotDescription);

css/c3.min.css

@@ -1,5 +0,0 @@
-/*
- * @deprecated 3.2.0 N°5621 Moved to NPM
- */
-
-.c3 svg{font:10px sans-serif;-webkit-tap-highlight-color:transparent}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-title{font:14px sans-serif}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}

css/jquery.contextMenu.css

@@ -1,146 +0,0 @@
-/**
- * @deprecated 3.2.0 N°5621 Moved to NPM
- */
-
-/*!
- * jQuery contextMenu - Plugin for simple contextMenu handling
- *
- * Version: git-master
- *
- * Authors: Rodney Rehm, Addy Osmani (patches for FF)
- * Web: http://medialize.github.com/jQuery-contextMenu/
- *
- * Licensed under
- *   MIT License http://www.opensource.org/licenses/mit-license
- *   GPL v3 http://opensource.org/licenses/GPL-3.0
- *
- */
-
-.context-menu-list {
-    margin:0; 
-    padding:0;
-    
-    min-width: 120px;
-    max-width: 250px;
-    display: inline-block;
-    position: absolute;
-    list-style-type: none;
-    
-    border: 1px solid #DDD;
-    background: #EEE;
-    
-    -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-       -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-        -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-         -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-            box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-    
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-
-.context-menu-item {
-    padding: 2px 2px 2px 24px;
-    background-color: #EEE;
-    position: relative;
-    -webkit-user-select: none;
-       -moz-user-select: -moz-none;
-        -ms-user-select: none;
-            user-select: none;
-}
-
-.context-menu-separator {
-    padding-bottom:0;
-    border-bottom: 1px solid #DDD;
-}
-
-.context-menu-item > label > input,
-.context-menu-item > label > textarea {
-    -webkit-user-select: text;
-       -moz-user-select: text;
-        -ms-user-select: text;
-            user-select: text;
-}
-
-.context-menu-item.hover {
-    cursor: pointer;
-    background-color: #39F;
-}
-
-.context-menu-item.disabled {
-    color: #666;
-}
-
-.context-menu-input.hover,
-.context-menu-item.disabled.hover {
-    cursor: default;
-    background-color: #EEE;
-}
-
-.context-menu-submenu:after {
-    content: ">";
-    color: #666;
-    position: absolute;
-    top: 0;
-    right: 3px;
-    z-index: 1;
-}
-
-/* icons
-    #protip:
-    In case you want to use sprites for icons (which I would suggest you do) have a look at
-    http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement 
-    .context-menu-item.icon:before {}
- */
-.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
-.context-menu-item.icon-edit { background-image: url(images/page_white_edit.png); }
-.context-menu-item.icon-cut { background-image: url(images/cut.png); }
-.context-menu-item.icon-copy { background-image: url(images/page_white_copy.png); }
-.context-menu-item.icon-paste { background-image: url(images/page_white_paste.png); }
-.context-menu-item.icon-delete { background-image: url(images/page_white_delete.png); }
-.context-menu-item.icon-add { background-image: url(images/page_white_add.png); }
-.context-menu-item.icon-quit { background-image: url(images/door.png); }
-
-/* vertically align inside labels */
-.context-menu-input > label > * { vertical-align: top; }
-
-/* position checkboxes and radios as icons */
-.context-menu-input > label > input[type="checkbox"],
-.context-menu-input > label > input[type="radio"] {
-    margin-left: -17px;
-}
-.context-menu-input > label > span {
-    margin-left: 5px;
-}
-
-.context-menu-input > label,
-.context-menu-input > label > input[type="text"],
-.context-menu-input > label > textarea,
-.context-menu-input > label > select {
-    display: block;
-    width: 100%;
-    
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-         -o-box-sizing: border-box;
-            box-sizing: border-box;
-}
-
-.context-menu-input > label > textarea {
-    height: 100px;
-}
-.context-menu-item > .context-menu-list {
-    display: none;
-    /* re-positioned by js */
-    right: -5px;
-    top: 5px;
-}
-
-.context-menu-item.hover > .context-menu-list {
-    display: block;
-}
-
-.context-menu-accesskey {
-    text-decoration: underline;
-}

css/magnific-popup.css

@@ -1,378 +0,0 @@
-/*
- * @deprecated 3.2.0 N°5621 Moved to NPM
- */
-
-/* Magnific Popup CSS */
-.mfp-bg {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1042;
-  overflow: hidden;
-  position: fixed;
-  background: #0b0b0b;
-  opacity: 0.8;
-  filter: alpha(opacity=80); }
-
-.mfp-wrap {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1043;
-  position: fixed;
-  outline: none !important;
-  -webkit-backface-visibility: hidden; }
-
-.mfp-container {
-  text-align: center;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box; }
-
-.mfp-container:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle; }
-
-.mfp-align-top .mfp-container:before {
-  display: none; }
-
-.mfp-content {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0 auto;
-  text-align: left;
-  z-index: 1045; }
-
-.mfp-inline-holder .mfp-content, .mfp-ajax-holder .mfp-content {
-  width: 100%;
-  cursor: auto; }
-
-.mfp-ajax-cur {
-  cursor: progress; }
-
-.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
-  cursor: -moz-zoom-out;
-  cursor: -webkit-zoom-out;
-  cursor: zoom-out; }
-
-.mfp-zoom {
-  cursor: pointer;
-  cursor: -webkit-zoom-in;
-  cursor: -moz-zoom-in;
-  cursor: zoom-in; }
-
-.mfp-auto-cursor .mfp-content {
-  cursor: auto; }
-
-.mfp-close, .mfp-arrow, .mfp-preloader, .mfp-counter {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none; }
-
-.mfp-loading.mfp-figure {
-  display: none; }
-
-.mfp-hide {
-  display: none !important; }
-
-.mfp-preloader {
-  color: #CCC;
-  position: absolute;
-  top: 50%;
-  width: auto;
-  text-align: center;
-  margin-top: -0.8em;
-  left: 8px;
-  right: 8px;
-  z-index: 1044; }
-  .mfp-preloader a {
-    color: #CCC; }
-    .mfp-preloader a:hover {
-      color: #FFF; }
-
-.mfp-s-ready .mfp-preloader {
-  display: none; }
-
-.mfp-s-error .mfp-content {
-  display: none; }
-
-button.mfp-close, button.mfp-arrow {
-  overflow: visible;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-  display: block;
-  outline: none;
-  padding: 0;
-  z-index: 1046;
-  -webkit-box-shadow: none;
-  box-shadow: none; }
-button::-moz-focus-inner {
-  padding: 0;
-  border: 0; }
-
-.mfp-close {
-  width: 44px;
-  height: 44px;
-  line-height: 44px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  text-decoration: none;
-  text-align: center;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  padding: 0 0 18px 10px;
-  color: #FFF;
-  font-style: normal;
-  font-size: 28px;
-  font-family: Arial, Baskerville, monospace; }
-  .mfp-close:hover, .mfp-close:focus {
-    opacity: 1;
-    filter: alpha(opacity=100); }
-  .mfp-close:active {
-    top: 1px; }
-
-.mfp-close-btn-in .mfp-close {
-  color: #333; }
-
-.mfp-image-holder .mfp-close, .mfp-iframe-holder .mfp-close {
-  color: #FFF;
-  right: -6px;
-  text-align: right;
-  padding-right: 6px;
-  width: 100%; }
-
-.mfp-counter {
-  position: absolute;
-  top: 0;
-  right: 0;
-  color: #CCC;
-  font-size: 12px;
-  line-height: 18px;
-  white-space: nowrap; }
-
-.mfp-arrow {
-  position: absolute;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  margin: 0;
-  top: 50%;
-  margin-top: -55px;
-  padding: 0;
-  width: 90px;
-  height: 110px;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
-  .mfp-arrow:active {
-    margin-top: -54px; }
-  .mfp-arrow:hover, .mfp-arrow:focus {
-    opacity: 1;
-    filter: alpha(opacity=100); }
-  .mfp-arrow:before, .mfp-arrow:after, .mfp-arrow .mfp-b, .mfp-arrow .mfp-a {
-    content: '';
-    display: block;
-    width: 0;
-    height: 0;
-    position: absolute;
-    left: 0;
-    top: 0;
-    margin-top: 35px;
-    margin-left: 35px;
-    border: medium inset transparent; }
-  .mfp-arrow:after, .mfp-arrow .mfp-a {
-    border-top-width: 13px;
-    border-bottom-width: 13px;
-    top: 8px; }
-  .mfp-arrow:before, .mfp-arrow .mfp-b {
-    border-top-width: 21px;
-    border-bottom-width: 21px;
-    opacity: 0.7; }
-
-.mfp-arrow-left {
-  left: 0; }
-  .mfp-arrow-left:after, .mfp-arrow-left .mfp-a {
-    border-right: 17px solid #FFF;
-    margin-left: 31px; }
-  .mfp-arrow-left:before, .mfp-arrow-left .mfp-b {
-    margin-left: 25px;
-    border-right: 27px solid #3F3F3F; }
-
-.mfp-arrow-right {
-  right: 0; }
-  .mfp-arrow-right:after, .mfp-arrow-right .mfp-a {
-    border-left: 17px solid #FFF;
-    margin-left: 39px; }
-  .mfp-arrow-right:before, .mfp-arrow-right .mfp-b {
-    border-left: 27px solid #3F3F3F; }
-
-.mfp-iframe-holder {
-  padding-top: 40px;
-  padding-bottom: 40px; }
-  .mfp-iframe-holder .mfp-content {
-    line-height: 0;
-    width: 100%;
-    max-width: 900px; }
-  .mfp-iframe-holder .mfp-close {
-    top: -40px; }
-
-.mfp-iframe-scaler {
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  padding-top: 56.25%; }
-  .mfp-iframe-scaler iframe {
-    position: absolute;
-    display: block;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
-    background: #000; }
-
-/* Main image in popup */
-img.mfp-img {
-  width: auto;
-  max-width: 100%;
-  height: auto;
-  display: block;
-  line-height: 0;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 40px 0 40px;
-  margin: 0 auto; }
-
-/* The shadow behind the image */
-.mfp-figure {
-  line-height: 0; }
-  .mfp-figure:after {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 40px;
-    bottom: 40px;
-    display: block;
-    right: 0;
-    width: auto;
-    height: auto;
-    z-index: -1;
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
-    background: #444; }
-  .mfp-figure small {
-    color: #BDBDBD;
-    display: block;
-    font-size: 12px;
-    line-height: 14px; }
-  .mfp-figure figure {
-    margin: 0; }
-
-.mfp-bottom-bar {
-  margin-top: -36px;
-  position: absolute;
-  top: 100%;
-  left: 0;
-  width: 100%;
-  cursor: auto; }
-
-.mfp-title {
-  text-align: left;
-  line-height: 18px;
-  color: #F3F3F3;
-  word-wrap: break-word;
-  padding-right: 36px; }
-
-.mfp-image-holder .mfp-content {
-  max-width: 100%; }
-
-.mfp-gallery .mfp-image-holder .mfp-figure {
-  cursor: pointer; }
-
-@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
-  /**
-       * Remove all paddings around the image on small screen
-       */
-  .mfp-img-mobile .mfp-image-holder {
-    padding-left: 0;
-    padding-right: 0; }
-  .mfp-img-mobile img.mfp-img {
-    padding: 0; }
-  .mfp-img-mobile .mfp-figure:after {
-    top: 0;
-    bottom: 0; }
-  .mfp-img-mobile .mfp-figure small {
-    display: inline;
-    margin-left: 5px; }
-  .mfp-img-mobile .mfp-bottom-bar {
-    background: rgba(0, 0, 0, 0.6);
-    bottom: 0;
-    margin: 0;
-    top: auto;
-    padding: 3px 5px;
-    position: fixed;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box; }
-    .mfp-img-mobile .mfp-bottom-bar:empty {
-      padding: 0; }
-  .mfp-img-mobile .mfp-counter {
-    right: 5px;
-    top: 3px; }
-  .mfp-img-mobile .mfp-close {
-    top: 0;
-    right: 0;
-    width: 35px;
-    height: 35px;
-    line-height: 35px;
-    background: rgba(0, 0, 0, 0.6);
-    position: fixed;
-    text-align: center;
-    padding: 0; }
- }
-
-@media all and (max-width: 900px) {
-  .mfp-arrow {
-    -webkit-transform: scale(0.75);
-    transform: scale(0.75); }
-
-  .mfp-arrow-left {
-    -webkit-transform-origin: 0;
-    transform-origin: 0; }
-
-  .mfp-arrow-right {
-    -webkit-transform-origin: 100%;
-    transform-origin: 100%; }
-
-  .mfp-container {
-    padding-left: 6px;
-    padding-right: 6px; }
- }
-
-.mfp-ie7 .mfp-img {
-  padding: 0; }
-.mfp-ie7 .mfp-bottom-bar {
-  width: 600px;
-  left: 50%;
-  margin-left: -300px;
-  margin-top: 5px;
-  padding-bottom: 5px; }
-.mfp-ie7 .mfp-container {
-  padding: 0; }
-.mfp-ie7 .mfp-content {
-  padding-top: 44px; }
-.mfp-ie7 .mfp-close {
-  top: 0;
-  right: 0;
-  padding-top: 0; }

datamodels/2.x/authent-cas/datamodel.authent-cas.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.2.0',
+	'authent-cas/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.2.0',
+	'authent-external/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/3.2.0',
+	'authent-ldap/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/datamodel.authent-local.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.2.0',
+	'authent-local/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">

datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.2.0',
+	'combodo-backoffice-darkmoon-theme/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-high-contrast" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/module.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-high-contrast-theme/3.2.0',
+	'combodo-backoffice-fullmoon-high-contrast-theme/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-protanopia-deuteranopia" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/module.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.2.0',
+	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-tritanopia" _delta="define">

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/module.combodo-backoffice-fullmoon-tritanopia-theme.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-tritanopia-theme/3.2.0',
+	'combodo-backoffice-fullmoon-tritanopia-theme/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>30</rank>

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

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/3.2.0',
+	'combodo-db-tools/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>

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

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.2.0',
+	'itop-attachments/3.3.0',
 	array(
 		// Identification
 		//

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

@@ -120,7 +120,7 @@ try
 			try
 			{
 				set_time_limit(0);
-				$oBB = new BackupExec(APPROOT.'data/backups/manual/', 0 /*iRetentionCount*/);
+				$oBB = new BackupExec(utils::GetDataPath().'backups/manual/', 0 /*iRetentionCount*/);
 				$sRes = $oBB->Process(time() + 36000); // 10 hours to complete should be sufficient!
 			}
 			catch (Exception $e)
@@ -185,7 +185,7 @@ try
 				$oDBRS = new DBRestore($oItopConfig);
 				$oDBRS->SetMySQLBinDir($sMySQLBinDir);
 
-				$sBackupDir = APPROOT.'data/backups/';
+				$sBackupDir = utils::GetDataPath().'backups/';
 				$sBackupFile = $sBackupDir.$sFile;
 				$sRes = $oDBRS->RestoreFromCompressedBackup($sBackupFile, $sEnvironment);
 
@@ -210,7 +210,7 @@ try
 			}
 			$sFile = utils::ReadParam('file', '', false, 'raw_data');
 			$oBackup = new DBBackupScheduled();
-			$sBackupDir = APPROOT.'data/backups/';
+			$sBackupDir = utils::GetDataPath().'backups/';
 			$sBackupFilePath = utils::RealPath($sBackupDir.$sFile, $sBackupDir);
 			if ($sBackupFilePath === false)
 			{

datamodels/2.x/itop-backup/datamodel.itop-backup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>

datamodels/2.x/itop-backup/dbrestore.class.inc.php

@@ -154,7 +154,7 @@ class DBRestore extends DBBackup
 
 				// Load the database
 				//
-				$sDataDir = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
+				$sDataDir = utils::GetDataPath().'tmp-backup-'.rand(10000, getrandmax());
 
 				SetupUtils::builddir($sDataDir); // Here is the directory
 				$oArchive->extractTo($sDataDir);
@@ -164,7 +164,7 @@ class DBRestore extends DBBackup
 
 				// Update the code
 				//
-				$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
+				$sDeltaFile = utils::GetDataPath().$sEnvironment.'.delta.xml';
 
 				if (is_file($sDataDir.'/delta.xml')) {
 					// Extract and rename delta.xml => <env>.delta.xml;
@@ -172,15 +172,15 @@ class DBRestore extends DBBackup
 				} else {
 					@unlink($sDeltaFile);
 				}
-				if (is_dir(APPROOT.'data/production-modules/')) {
+				if (is_dir(utils::GetDataPath().'production-modules/')) {
 					try {
-						SetupUtils::rrmdir(APPROOT.'data/production-modules/');
+						SetupUtils::rrmdir(utils::GetDataPath().'production-modules/');
 					} catch (Exception $e) {
 						throw new BackupException("Can't remove production-modules dir", 0, $e);
 					}
 				}
 				if (is_dir($sDataDir.'/production-modules')) {
-					rename($sDataDir.'/production-modules', APPROOT.'data/production-modules/');
+					rename($sDataDir.'/production-modules', utils::GetDataPath().'production-modules/');
 				}
 
 				$sConfigFile = APPROOT.'conf/'.$sEnvironment.'/config-itop.php';

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

@@ -109,7 +109,7 @@ class BackupExec extends AbstractWeeklyScheduledProcess
 	{
 		if (is_null($sBackupDir))
 		{
-			$this->sBackupDir = APPROOT.'data/backups/auto/';
+			$this->sBackupDir = utils::GetDataPath().'backups/auto/';
 		}
 		else
 		{

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

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.2.0',
+	'itop-backup/3.3.0',
 	array(
 		// Identification
 		//

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

@@ -131,7 +131,7 @@ try {
 	// Destination directory
 	//
 	// Make sure the target directory exists and is writeable
-	$sBackupDir = realpath(APPROOT.'data/backups/');
+	$sBackupDir = realpath(utils::GetDataPath().'backups/');
 	SetupUtils::builddir($sBackupDir);
 	if (!is_dir($sBackupDir)) {
 		$oBlockForChecks->AddSubBlock(

datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToProviderContract" _delta="define">

datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.2.0',
+	'itop-bridge-cmdb-services/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">
@@ -142,6 +142,19 @@
         </field>
       </fields>
     </class>
+    <class id="Ticket" _delta="must_exist">
+      <fields>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkFunctionalCIToTicket</linked_class>
+          <ext_key_to_me>ticket_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <with_php_computation>true</with_php_computation>
+          <duplicates/>
+        </field>
+      </fields>
+    </class>
   </classes>
   <menus>
   </menus>

datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.2.0',
+	'itop-bridge-cmdb-ticket/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Rack" _delta="must_exist">

datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.2.0',
+	'itop-bridge-datacenter-mgmt-services/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Phone" _delta="must_exist">

datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.2.0',
+	'itop-bridge-endusers-devices-services/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="SANSwitch" _delta="must_exist">

datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.2.0',
+	'itop-bridge-storage-mgmt-services/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Hypervisor" _delta="must_exist">

datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.2.0',
+	'itop-bridge-virtualization-mgmt-services/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/3.2.0',
+	'itop-bridge-virtualization-storage/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/3.2.0',
+	'itop-change-mgmt-itil/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>

datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/3.2.0',
+	'itop-change-mgmt/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>

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

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/3.2.0',
+	'itop-config-mgmt/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config/datamodel.itop-config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>

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

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.2.0',
+	'itop-config/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>

datamodels/2.x/itop-core-update/module.itop-core-update.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/3.2.0',
+	'itop-core-update/3.3.0',
 	[
 		// Identification
 		//

datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php

@@ -486,7 +486,7 @@ final class CoreUpdater
 	 */
 	private static function GetItopArchiveName()
 	{
-		$sItopArchiveName = APPROOT.'data/backups/itop';
+		$sItopArchiveName = utils::GetDataPath().'backups/itop';
 		return $sItopArchiveName;
 	}
 
@@ -504,7 +504,7 @@ final class CoreUpdater
 	 */
 	private static function GetBackupName()
 	{
-		$sBackupName = APPROOT.'data/backups/manual/backup-core-update';
+		$sBackupName = utils::GetDataPath().'backups/manual/backup-core-update';
 		return $sBackupName;
 	}
 

datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>

datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/3.2.0',
+	'itop-datacenter-mgmt/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="TelephonyCI" _delta="define">
       <parent>PhysicalDevice</parent>

datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php

@@ -25,7 +25,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.2.0',
+	'itop-endusers-devices/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="FAQ" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-faq-light/module.itop-faq-light.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.2.0',
+	'itop-faq-light/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
 </itop_design>

datamodels/2.x/itop-files-information/module.itop-files-information.php

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/3.2.0',
+	'itop-files-information/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Ticket">
       <methods>

datamodels/2.x/itop-full-itil/module.itop-full-itil.php

@@ -6,7 +6,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/3.2.0',
+	'itop-full-itil/3.3.0',
 	array(
 		// Identification
 		//

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

@@ -186,7 +186,7 @@ try
 			require_once (APPROOT.'/application/loginwebpage.class.inc.php');
 			LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
 
-			$sDBBackupPath = APPROOT.'data/backups/manual';
+			$sDBBackupPath = utils::GetDataPath().'backups/manual';
 			$aChecks = SetupUtils::CheckBackupPrerequisites($sDBBackupPath);
 			$bFailed = false;
 			foreach ($aChecks as $oCheckResult)
@@ -259,7 +259,7 @@ try
 		case 'compile':
 			SetupLog::Info('Deployment starts...');
 			$sAuthent = utils::ReadParam('authent', '', false, 'raw_data');
-			if (!file_exists(APPROOT.'data/hub/compile_authent') || $sAuthent !== file_get_contents(APPROOT.'data/hub/compile_authent'))
+			if (!file_exists(utils::GetDataPath().'hub/compile_authent') || $sAuthent !== file_get_contents(utils::GetDataPath().'hub/compile_authent'))
 			{
 					throw new SecurityException(Dict::S('iTopHub:FailAuthent'));
 			}
@@ -302,11 +302,11 @@ try
 			{
 				SetupLog::Info('Move to production starts...');
 			    $sAuthent = utils::ReadParam('authent', '', false, 'raw_data');
-				if (!file_exists(APPROOT.'data/hub/compile_authent') || $sAuthent !== file_get_contents(APPROOT.'data/hub/compile_authent'))
+				if (!file_exists(utils::GetDataPath().'hub/compile_authent') || $sAuthent !== file_get_contents(utils::GetDataPath().'hub/compile_authent'))
 				{
 					throw new SecurityException(Dict::S('iTopHub:FailAuthent'));
 				}
-				unlink(APPROOT.'data/hub/compile_authent');
+				unlink(utils::GetDataPath().'hub/compile_authent');
 				// Load the "production" config file to clone & update it
 				$oConfig = new Config(APPCONF.'production/'.ITOP_CONFIG_FILE);
 				SetupUtils::EnterReadOnlyMode($oConfig);
@@ -371,9 +371,9 @@ try
 			}
 			catch (Exception $e)
 			{
-				if(file_exists(APPROOT.'data/hub/compile_authent'))
+				if(file_exists(utils::GetDataPath().'hub/compile_authent'))
 				{
-					unlink(APPROOT.'data/hub/compile_authent');
+					unlink(utils::GetDataPath().'hub/compile_authent');
 				}
 				// Note: at this point, the dictionnary is not necessarily loaded
 				SetupLog::Error(get_class($e).': '.Dict::S('iTopHub:ConfigurationSafelyReverted')."\n".$e->getMessage());

datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>

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

@@ -78,7 +78,7 @@ class HubNewsroomProvider extends NewsroomProviderBase
 		$sBaseUrl = $this->oConfig->GetModuleSetting('itop-hub-connector', 'url').MetaModel::GetModuleSetting('itop-hub-connector', $sRouteCode);
 		
 		$sParameters = 'uuid[bdd]='.urlencode((string) trim(DBProperty::GetProperty('database_uuid', ''), '{}'));
-		$sParameters .= '&uuid[file]='.urlencode((string) trim(@file_get_contents(APPROOT."data/instance.txt"), "{} \n"));
+		$sParameters .= '&uuid[file]='.urlencode((string) trim(@file_get_contents(utils::GetDataPath()."instance.txt"), "{} \n"));
 		$sParameters .= '&uuid[user]='.urlencode(UserRights::GetUserId());
 		
 		return $sBaseUrl.'?'.$sParameters;

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

@@ -15,7 +15,7 @@ function DisplayStatus(WebPage $oPage)
 
 	$oPage->add('<div class="module-selection-body">');
 	// Now scan the extensions and display a report of the extensions brought by the hub
-	$sPath = APPROOT.'data/downloaded-extensions/';
+	$sPath = utils::GetDataPath().'downloaded-extensions/';
 	$aExtraDirs = array();
 	if (is_dir($sPath)) {
 		$aExtraDirs[] = $sPath; // Also read the extra downloaded-modules directory
@@ -84,7 +84,7 @@ function DoLanding(WebPage $oPage)
 		throw new Exception("Inconsistent version '$sVersion', expecting ".ITOP_VERSION."'");
 	}
 
-	$sFileUUID = (string)trim(@file_get_contents(APPROOT."data/instance.txt"), "{} \n");
+	$sFileUUID = (string)trim(@file_get_contents(utils::GetDataPath()."instance.txt"), "{} \n");
 	if ($sInstanceUUID != $sFileUUID) {
 		throw new Exception("Inconsistent file UUID '$sInstanceUUID', expecting ".$sFileUUID."'");
 	}
@@ -97,7 +97,7 @@ function DoLanding(WebPage $oPage)
 	// Uncompression of extensions in data/downloaded-extensions
 	// only newly downloaded extensions reside in this folder
 	$i = 0;
-	$sPath = APPROOT.'data/downloaded-extensions/';
+	$sPath = utils::GetDataPath().'downloaded-extensions/';
 	if (!is_dir($sPath)) {
 		if (!mkdir($sPath)) {
 			throw new Exception("ERROR: Unable to create the directory '$sPath'. Cannot download any extension. Check the access rights on '".dirname('data/downloaded-extensions/')."'");
@@ -112,7 +112,7 @@ function DoLanding(WebPage $oPage)
 
 		$sZipArchiveFile = $sPath."/extension-{$i}.zip";
 		file_put_contents($sZipArchiveFile, $sArchive);
-		// Expand the content of extension-x.zip into  APPROOT.'data/downloaded-extensions/'
+		// Expand the content of extension-x.zip into  utils::GetDataPath().'downloaded-extensions/'
 		// where the installation will load the extension automatically
 		$oZip = new ZipArchive();
 		if (!$oZip->open($sZipArchiveFile)) {
@@ -136,7 +136,7 @@ function DoLanding(WebPage $oPage)
 function DoInstall(WebPage $oPage)
 {
 	$sUID = hash('sha256', rand());
-	file_put_contents(APPROOT.'data/hub/compile_authent', $sUID);
+	file_put_contents(utils::GetDataPath().'hub/compile_authent', $sUID);
 
 	$oPage->LinkStylesheetFromModule('itop-hub-connector/css/hub.css');
 	$oPage->add('<table class="module-selection-banner"><tr>');
@@ -151,7 +151,7 @@ function DoInstall(WebPage $oPage)
 
 	// Now scan the extensions and display a report of the extensions brought by the hub
 	// Now scan the extensions and display a report of the extensions brought by the hub
-	$sPath = APPROOT.'data/downloaded-extensions/';
+	$sPath = utils::GetDataPath().'downloaded-extensions/';
 	$aExtraDirs = array();
 	if (is_dir($sPath)) {
 		$aExtraDirs[] = $sPath; // Also read the extra downloaded-modules directory
@@ -283,8 +283,8 @@ CSS
 			break;
 
 		case 'install':
-			if (!file_exists(APPROOT.'data/hub')) {
-				mkdir(APPROOT.'data/hub');
+			if (!file_exists(utils::GetDataPath().'hub')) {
+				mkdir(utils::GetDataPath().'hub');
 			}
 			DoInstall($oPage);
 			break;

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

@@ -231,7 +231,7 @@ function MakeDataToPost($sTargetRoute)
 			'itop_hub_target_route' => $sTargetRoute,
 			'itop_stack' => array(
 				"uuidBdd" => (string)trim(DBProperty::GetProperty('database_uuid', ''), '{}'), // TODO check if empty and... regenerate a new UUID ??
-				"uuidFile" => (string)trim(@file_get_contents(APPROOT."data/instance.txt"), "{} \n"), // TODO check if empty and... regenerate a new UUID ??
+				"uuidFile" => (string)trim(@file_get_contents(utils::GetDataPath()."instance.txt"), "{} \n"), // TODO check if empty and... regenerate a new UUID ??
 				'instance_friendly_name' => (string)$_SERVER['SERVER_NAME'],
 				'instance_host' => (string)utils::GetAbsoluteUrlAppRoot(),
 				'application_name' => (string)ITOP_APPLICATION,

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

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/3.2.0',
+	'itop-hub-connector/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Incident" _delta="define">
       <parent>Ticket</parent>

datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/3.2.0',
+	'itop-incident-mgmt-itil/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="KnownError" _delta="define">
       <parent>cmdbAbstractObject</parent>

datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/3.2.0',
+	'itop-knownerror-mgmt/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="OAuthClient" _delta="define">

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-oauth-client/3.2.0',
+	'itop-oauth-client/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.2">
+<itop_design version="3.3">
   <events>
     <event id="EVENT_DISPLAY_OBJECT_DETAILS" _delta="define">
       <name>Portal object displayed</name>

datamodels/2.x/itop-portal-base/module.itop-portal-base.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/3.2.0', array(
+	'itop-portal-base/3.3.0', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',
@@ -54,3 +54,11 @@ SetupWebPage::AddModule(
 	),
 	)
 );
+
+
+//  ____  _                       _        _                                      __   _   _                             _        _    _______
+// |  _ \| | ___  __ _ ___  ___  | |_ __ _| | _____    ___ __ _ _ __ ___    ___  / _| | |_| |__   ___   _ __   ___  _ __| |_ __ _| |  / /___ /
+// | |_) | |/ _ \/ _` / __|/ _ \ | __/ _` | |/ / _ \  / __/ _` | '__/ _ \  / _ \| |_  | __| '_ \ / _ \ | '_ \ / _ \| '__| __/ _` | | / /  |_ \
+// |  __/| |  __/ (_| \__ \  __/ | || (_| |   <  __/ | (_| (_| | | |  __/ | (_) |  _| | |_| | | |  __/ | |_) | (_) | |  | || (_| | | \ \ ___) |
+// |_|   |_|\___|\__,_|___/\___|  \__\__,_|_|\_\___|  \___\__,_|_|  \___|  \___/|_|    \__|_| |_|\___| | .__/ \___/|_|   \__\__,_|_|  \_\____/
+//                                                                                                     |_|

datamodels/2.x/itop-portal/datamodel.itop-portal.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <portals>
     <portal id="itop-portal" _delta="define">
       <!-- ID must match module_design[id] -->

datamodels/2.x/itop-portal/module.itop-portal.php

@@ -20,7 +20,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/3.2.0', array(
+	'itop-portal/3.3.0', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',

datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Problem" _delta="define">
       <parent>Ticket</parent>

datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/3.2.0',
+	'itop-problem-mgmt/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes/>
   <user_rights>
     <groups>

datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/3.2.0',
+	'itop-profiles-itil/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>

datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/3.2.0',
+	'itop-request-mgmt-itil/3.3.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>