Prepare 2.7.6 version

# Conflicts:
#	sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php

application/transaction.class.inc.php

@@ -193,16 +193,19 @@ class privUITransactionSession
  */
 class privUITransactionFile
 {
+	/** @var int Value to use when no user logged */
+	const UNAUTHENTICATED_USER_ID = -666;
+
 	/**
-	 * @return int
-	 * @throws \SecurityException if no connected user
+	 * @return int current user id, or {@see self::UNAUTHENTICATED_USER_ID} if no user logged
 	 *
 	 * @since 2.6.5 2.7.6 3.0.0 N°4289 method creation
 	 */
-	private static function GetCurrentUserId() {
+	private static function GetCurrentUserId()
+	{
 		$iCurrentUserId = UserRights::GetConnectedUserId();
 		if ('' === $iCurrentUserId) {
-			throw new SecurityException('Cannot creation transaction_id when no user logged');
+			$iCurrentUserId = static::UNAUTHENTICATED_USER_ID;
 		}
 
 		return $iCurrentUserId;

application/ui.extkeywidget.class.inc.php

@@ -372,7 +372,7 @@ EOF
 		$sHTML .= "</form>\n";
 		$sHTML .= '</div></div>';
 
-		$sDialogTitleSanitized = utils::HtmlToText($sTitle);
+		$sDialogTitleSanitized = addslashes(utils::HtmlToText($sTitle));
 		$oPage->add_ready_script(
 <<<EOF
 		$('#ac_dlg_{$this->iId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, title: '$sDialogTitleSanitized', resizeStop: oACWidget_{$this->iId}.UpdateSizes, close: oACWidget_{$this->iId}.OnClose });

core/apc-service.class.inc.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Class ApcService
+ * @since 2.7.6 N°4125
+ */
+class ApcService {
+	public function __construct() {
+	}
+
+	/**
+	 * @param string $function_name
+	 * @return bool
+	 * @see function_exists()
+	 */
+	public function function_exists($function_name) {
+		return function_exists($function_name);
+	}
+
+	/**
+	 * @param string|array $key
+	 * @return mixed
+	 * @see apc_fetch()
+	 */
+	function apc_fetch($key)
+	{
+		return apc_fetch($key);
+	}
+
+	/**
+	 * @param array|string $key
+	 * @param $var
+	 * @param int $ttl
+	 * @return array|bool
+	 * @see apc_store()
+	 */
+	function apc_store($key, $var = NULL, $ttl = 0)
+	{
+		return apc_store($key, $var, $ttl);
+	}
+}
+?>

core/dict.class.inc.php

@@ -64,6 +64,8 @@ class Dict
 	protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
 	protected static $m_aData = array();
 	protected static $m_sApplicationPrefix = null;
+	/** @var \ApcService $m_oApcService  */
+	protected static $m_oApcService = null;
 
 	/**
 	 * @param $sLanguageCode
@@ -145,15 +147,17 @@ class Dict
 	{
 		// Attempt to find the string in the user language
 		//
-		self::InitLangIfNeeded(self::GetUserLanguage());
+		$sLangCode = self::GetUserLanguage();
+		self::InitLangIfNeeded($sLangCode);
 
-		if (!array_key_exists(self::GetUserLanguage(), self::$m_aData))
+		if (!array_key_exists($sLangCode, self::$m_aData))
 		{
+			IssueLog::Warning("Cannot find $sLangCode in dictionnaries. default labels displayed");
 			// It may happen, when something happens before the dictionaries get loaded
 			return $sStringCode;
 		}
-		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
-		if (array_key_exists($sStringCode, $aCurrentDictionary))
+		$aCurrentDictionary = self::$m_aData[$sLangCode];
+		if (is_array($aCurrentDictionary) && array_key_exists($sStringCode, $aCurrentDictionary))
 		{
 			return $aCurrentDictionary[$sStringCode];
 		}
@@ -164,7 +168,7 @@ class Dict
 			self::InitLangIfNeeded(self::$m_sDefaultLanguage);
 			
 			$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
-			if (array_key_exists($sStringCode, $aDefaultDictionary))
+			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
 			{
 				return $aDefaultDictionary[$sStringCode];
 			}
@@ -173,7 +177,7 @@ class Dict
 			self::InitLangIfNeeded('EN US');
 
 			$aDefaultDictionary = self::$m_aData['EN US'];
-			if (array_key_exists($sStringCode, $aDefaultDictionary))
+			if (is_array($aDefaultDictionary) && array_key_exists($sStringCode, $aDefaultDictionary))
 			{
 				return $aDefaultDictionary[$sStringCode];
 			}
@@ -232,7 +236,26 @@ class Dict
 	{
 		self::$m_aLanguages = $aLanguagesList;
 	}
-	
+
+	/**
+	 * @since 2.7.6 N°4125
+	 * @return \ApcService
+	 */
+	public static function GetApcService() {
+		if (self::$m_oApcService === null){
+			self::$m_oApcService = new ApcService();
+		}
+		return self::$m_oApcService;
+	}
+
+	/**
+	 * @since 2.7.6 N°4125
+	 * @param \ApcService $m_oApcService
+	 */
+	public static function SetApcService($oApcService) {
+		self::$m_oApcService = $oApcService;
+	}
+
 	/**
 	 * Load a language from the language dictionary, if not already loaded
 	 * @param string $sLangCode Language code
@@ -241,20 +264,23 @@ class Dict
 	public static function InitLangIfNeeded($sLangCode)
 	{
 		if (array_key_exists($sLangCode, self::$m_aData)) return true;
-		
+
 		$bResult = false;
-		
-		if (function_exists('apc_fetch') && (self::$m_sApplicationPrefix !== null))
+
+		if (self::GetApcService()->function_exists('apc_fetch')
+			&& (self::$m_sApplicationPrefix !== null))
 		{
 			// Note: For versions of APC older than 3.0.17, fetch() accepts only one parameter
 			//
-			self::$m_aData[$sLangCode] = apc_fetch(self::$m_sApplicationPrefix.'-dict-'.$sLangCode);
-			if (self::$m_aData[$sLangCode] === false)
-			{
+			self::$m_aData[$sLangCode] = self::GetApcService()->apc_fetch(self::$m_sApplicationPrefix.'-dict-'.$sLangCode);
+			if (self::$m_aData[$sLangCode] === false) {
 				unset(self::$m_aData[$sLangCode]);
-			}
-			else
-			{
+			} else if (! is_array(self::$m_aData[$sLangCode])) {
+				// N°4125: we dont fix dictionnary corrupted cache (on iTop side).
+				// but we log an error in a dedicated channel to let itop administrator be aware of a potential APCu issue to fix.
+				IssueLog::Error("APCu corrupted data (with $sLangCode dictionnary). APCu configuration and running version should be troubleshooted...", LogChannels::APC);
+				$bResult = true;
+			} else {
 				$bResult = true;
 			}
 		}
@@ -263,9 +289,10 @@ class Dict
 			$sDictFile = APPROOT.'env-'.utils::GetCurrentEnvironment().'/dictionaries/'.str_replace(' ', '-', strtolower($sLangCode)).'.dict.php';
 			require_once($sDictFile);
 			
-			if (function_exists('apc_store') && (self::$m_sApplicationPrefix !== null))
+			if (self::GetApcService()->function_exists('apc_store')
+				&& (self::$m_sApplicationPrefix !== null))
 			{
-				apc_store(self::$m_sApplicationPrefix.'-dict-'.$sLangCode, self::$m_aData[$sLangCode]);
+				self::GetApcService()->apc_store(self::$m_sApplicationPrefix.'-dict-'.$sLangCode, self::$m_aData[$sLangCode]);
 			}
 			$bResult = true;
 		}

core/log.class.inc.php

@@ -542,6 +542,7 @@ class LogChannels
 	const DEADLOCK = 'DeadLock';
 	const INLINE_IMAGE = 'InlineImage';
 	const PORTAL = 'portal';
+	const APC = 'apc';
 }
 
 

css/css-variables.scss

@@ -17,7 +17,7 @@
  */
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.5";
+$version: "v2.7.6";
 $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors

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/2.7.5',
+	'authent-cas/2.7.6',
 	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/2.7.5',
+	'authent-external/2.7.6',
 	array(
 		// Identification
 		//

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

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

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

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

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/2.7.5',
+	'combodo-db-tools/2.7.6',
 	array(
 		// Identification
 		//

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/2.7.5',
+	'itop-attachments/2.7.6',
 	array(
 		// Identification
 		//

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

@@ -551,7 +551,7 @@ JS
 	  <td role="filename"><a href="$sDocDownloadUrl" target="_blank" class="$sIconClass">$sFileName</a>$sAttachmentMeta</td>
 	  <td role="formatted-size" data-order="$iFileSize">$sFileFormattedSize</td>
 	  <td role="upload-date" data-order="$iAttachmentDateRaw">$sAttachmentDateFormatted</td>
-	  <td role="uploader">$sAttachmentUploader</td>
+	  <td role="uploader">$sAttachmentUploaderForHtml</td>
 	  <td role="type">$sFileType</td>
 	  $sDeleteColumn
 	</tr>

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

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

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

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

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

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

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

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

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

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

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

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

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/2.7.5',
+	'itop-core-update/2.7.6',
 	array(
 		// Identification
 		//

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

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

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

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

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/2.7.5',
+	'itop-files-information/2.7.6',
 	array(
 		// Identification
 		//

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

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

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

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

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

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

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

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

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/2.7.5', array(
+	'itop-portal-base/2.7.6', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',

datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php

@@ -79,32 +79,50 @@ class ObjectFormManager extends FormManager
 	protected $aCallbackUrls = array();
 	/**
 	 * List of hidden fields, used for form update (eg. remove them from the form regarding they dependencies)
+	 *
 	 * @var array $aHiddenFieldsId
 	 * @since 2.7.5
 	 */
 	protected $aHiddenFieldsId = array();
 
 	/**
-	 * Creates an instance of \Combodo\iTop\Portal\Form\ObjectFormManager from JSON data that must contain at least :
-	 * - formobject_class : The class of the object that is being edited/viewed
-	 * - formmode : view|edit|create
-	 * - values for parent
+	 * @param string|array $formManagerData value of the formmanager_data portal parameter, either JSON or object
 	 *
-	 * @param bool $bTrustContent if false then won't allow TWIG content
+	 * @return array formmanager_data as a PHP array
+	 *
+	 * @since 2.7.6 3.0.0 N°4384 method creation : factorize as this is used twice now
+	 */
+	protected static function DecodeFormManagerData($formManagerData)
+	{
+		if (is_array($formManagerData)) {
+			return $formManagerData;
+		}
+
+		return json_decode($formManagerData, true);
+	}
+
+	/**
+	 * @param string $sJson JSON data that must contain at least :
+	 *       - formobject_class : The class of the object that is being edited/viewed
+	 *       - formmode : view|edit|create
+	 *       - values for parent
+	 * @param bool $bTrustContent if false then won't allow modified TWIG content
+	 *
+	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager new instance init from JSON data
 	 *
 	 * @inheritDoc
 	 * @throws \Exception
 	 * @throws \SecurityException if twig content is present and $bTrustContent is false
+	 *
+	 * @since 2.7.6 3.0.0 N°4384 new $bTrustContent parameter
 	 */
 	public static function FromJSON($sJson, $bTrustContent = false)
 	{
-		if (is_array($sJson)) {
-			$aJson = $sJson;
-		} else {
-			$aJson = json_decode($sJson, true);
-		}
+		$aJson = static::DecodeFormManagerData($sJson);
 
-		if (false === $bTrustContent) {
+		$oConfig = utils::GetConfig();
+		$bIsContentCheckEnabled = $oConfig->GetModuleSetting(PORTAL_ID, 'enable_formmanager_content_check', true);
+		if ($bIsContentCheckEnabled && (false === $bTrustContent)) {
 			/** @noinspection NestedPositiveIfStatementsInspection */
 			if (isset($aJson['formproperties']['layout']['type']) && ($aJson['formproperties']['layout']['type'] === 'twig')) {
 				// There will be an IssueLog above in the hierarchy due to the exception, but we are logging here so that we can output the JSON data !
@@ -175,7 +193,7 @@ class ObjectFormManager extends FormManager
 	 */
 	public static function CanTrustFormLayoutContent($sPostedFormManagerData, $aOriginalFormProperties)
 	{
-		$aPostedFormManagerData = json_decode($sPostedFormManagerData, true);
+		$aPostedFormManagerData = static::DecodeFormManagerData($sPostedFormManagerData);
 		$sPostedFormLayoutType = (isset($aPostedFormManagerData['formproperties']['layout']['type'])) ? $aPostedFormManagerData['formproperties']['layout']['type'] : '';
 
 		if ($sPostedFormLayoutType === 'xhtml') {

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/2.7.5', array(
+	'itop-portal/2.7.6', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',

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

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

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

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

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

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

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

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

datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php

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

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

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

datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php

@@ -18,7 +18,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-sla-computation/2.7.5',
+	'itop-sla-computation/2.7.6',
 	array(
 		// Identification
 		//

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

@@ -25,7 +25,7 @@
  
  SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	 'itop-storage-mgmt/2.7.5',
+	 'itop-storage-mgmt/2.7.6',
 	array(
 		// Identification
 		//

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

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__,
-	'itop-tickets/2.7.5',
+	'itop-tickets/2.7.6',
 	array(
 		// Identification
 		//

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

@@ -16,7 +16,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-virtualization-mgmt/2.7.5',
+	'itop-virtualization-mgmt/2.7.6',
 	array(
 		// Identification
 		//

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

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

datamodels/2.x/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <information>
-  <version>2.7.5</version>
+  <version>2.7.6</version>
 </information>

js/search/search_form_criteria_enum.js

@@ -225,7 +225,7 @@ $(function()
 			for (var i in aSortedValues)
 			{
 				var sValCode = aSortedValues[i][0];
-				var sValLabel = aSortedValues[i][1];
+				var sValLabel = $('<div/>').html(aSortedValues[i][1]).text();
 				var oValueElem = this._makeListItemElement(sValLabel, sValCode);
 				oValueElem.appendTo(oDynamicListElem);
 

lib/composer/autoload_classmap.php

@@ -17,6 +17,7 @@ return array(
     'ActionChecker' => $baseDir . '/core/userrights.class.inc.php',
     'ActionEmail' => $baseDir . '/core/action.class.inc.php',
     'ActionNotification' => $baseDir . '/core/action.class.inc.php',
+    'ApcService' => $baseDir . '/core/apc-service.class.inc.php',        
     'ApplicationContext' => $baseDir . '/application/applicationcontext.class.inc.php',
     'ApplicationException' => $baseDir . '/application/application.inc.php',
     'ApplicationMenu' => $baseDir . '/application/menunode.class.inc.php',

lib/composer/autoload_static.php

@@ -247,6 +247,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'ActionChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
         'ActionEmail' => __DIR__ . '/../..' . '/core/action.class.inc.php',
         'ActionNotification' => __DIR__ . '/../..' . '/core/action.class.inc.php',
+        'ApcService' => __DIR__ . '/../..' . '/core/apc-service.class.inc.php',        
         'ApplicationContext' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
         'ApplicationException' => __DIR__ . '/../..' . '/application/application.inc.php',
         'ApplicationMenu' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',

pages/ajax.render.php

@@ -1217,7 +1217,7 @@ try
 			break;
 
 		case 'save_dashboard':
-			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'element_identifier');
+			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'context_param');
 			$aExtraParams = utils::ReadParam('extra_params', array(), false, 'raw_data');
 			$sReloadURL = utils::ReadParam('reload_url', '', false, 'raw_data');
 			$sJSExtraParams = json_encode($aExtraParams);
@@ -1227,22 +1227,26 @@ try
 			$aParams['auto_reload'] = utils::ReadParam('auto_reload', false);
 			$aParams['auto_reload_sec'] = utils::ReadParam('auto_reload_sec', 300);
 			$aParams['cells'] = utils::ReadParam('cells', array(), false, 'raw_data');
+
 			$oDashboard = new RuntimeDashboard($sDashboardId);
 			$oDashboard->FromParams($aParams);
 			$oDashboard->Save();
+
 			$sDashboardFile = addslashes(utils::ReadParam('file', '', false, 'string'));
+			$sDashboardDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $sDashboardId);
+
 			// trigger a reload of the current page since the dashboard just changed
 			$oPage->add_script(
-				<<<EOF
-			$('.dashboard_contents#$sDashboardId').block();
+				<<<JS
+			$('.dashboard_contents#{$sDashboardDivId}').block();
 			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-			   { operation: 'reload_dashboard', dashboard_id: '$sDashboardId', file: '$sDashboardFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+			   { operation: 'reload_dashboard', dashboard_id: '{$sDashboardId}', file: '{$sDashboardFile}', extra_params: {$sJSExtraParams}, reload_url: '{$sReloadURL}'},
 			   function(data){
-				 $('.dashboard_contents#$sDashboardId').html(data);
-				 $('.dashboard_contents#$sDashboardId').unblock();
+				 $('.dashboard_contents#{$sDashboardDivId}').html(data);
+				 $('.dashboard_contents#{$sDashboardDivId}').unblock();
 				}
 			 );
-EOF
+JS
 			);
 			break;
 

sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php

@@ -368,7 +368,7 @@ JS
 											oData.items[i].target_id = oData.items[i].id;
 											
 											// Adding item to table only if it's not already there
-											if($('#{$sTableId} tr[role="row"] > td input[data-target-object-id="' + oData.items[i].target_id + '"], #{$sTableId} tr[role="row"] > td input[data-target-object-id="' + (oData.items[i].target_id*-1) + '"]').length === 0)
+											if($('#{$sTableId} tr[id] > td input[data-target-object-id="' + oData.items[i].target_id + '"], #{$sTableId} tr[id] > td input[data-target-object-id="' + (oData.items[i].target_id*-1) + '"]').length === 0)
 											{
 												// Making id negative in order to recognize it when persisting
 												oData.items[i].id = -1 * parseInt(oData.items[i].id);
@@ -462,7 +462,7 @@ EOF
 					    // Checking removed objects
 					    for(var i in oValues.current)
 					    {
-					        if($('#{$sTableId} tr[role="row"][id="'+i+'"]').length === 0)
+					        if($('#{$sTableId} tr[id="'+i+'"]').length === 0)
                             {
                                 oValues.remove[i] = {};
                             }
@@ -497,7 +497,7 @@ EOF
 					$('#{$sButtonAddId}').off('click').on('click', function(){
 						// Preparing current values
 						var aObjectIdsToIgnore = [];
-						$('#{$sTableId} tr[role="row"] > td input[data-target-object-id]').each(function(iIndex, oElem){
+						$('#{$sTableId} tr[id] > td input[data-target-object-id]').each(function(iIndex, oElem){
 							aObjectIdsToIgnore.push( $(oElem).attr('data-target-object-id') );
 						});
 						

test/application/privUITransactionFileTest.php

@@ -171,5 +171,13 @@ class privUITransactionFileTest extends ItopDataTestCase
 		$this->assertTrue($bUser1Login2, 'Login with user1 throw an error');
 		$bResult = privUITransactionFile::RemoveTransaction($sTransactionIdUserSupport);
 		$this->assertTrue($bResult, 'Token created by support user must be removed in the support user context');
+
+		// test when no user logged (combodo-unauthenticated-form module for example)
+		UserRights::_ResetSessionCache();
+		$sTransactionIdUnauthenticatedUser = privUITransactionFile::GetNewTransactionId();
+		$bResult = privUITransactionFile::IsTransactionValid($sTransactionIdUnauthenticatedUser, false);
+		$this->assertTrue($bResult, 'Token created by unauthenticated user must be valid when no user logged');
+		$bResult = privUITransactionFile::RemoveTransaction($sTransactionIdUnauthenticatedUser);
+		$this->assertTrue($bResult, 'Token created by unauthenticated user must be removed when no user logged');
 	}
 }

test/core/dictApcuTest.php

@@ -0,0 +1,402 @@
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 30/10/2017
+ * Time: 13:43
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Dict;
+use Exception;
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class dictApcuTest extends ItopTestCase
+{
+	private $sEnvName;
+	private $oApcService;
+	private $sDictionaryFolder;
+
+	protected function setUp()
+	{
+		parent::setUp();
+		require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'coreexception.class.inc.php');
+		require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'dict.class.inc.php');
+		require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'apc-service.class.inc.php');
+
+		$this->sEnvName = time();
+		$_SESSION['itop_env'] = $this->sEnvName;
+
+		$this->oApcService = $this->createMock(\ApcService::class);
+		Dict::SetApcService($this->oApcService);
+		Dict::EnableCache('toto');
+
+		Dict::SetLanguagesList(['FR FR' => 'fr', 'EN US' => 'en', 'DE DE' => 'de', 'RU RU' => 'de']);
+
+		$this->InitDictionnaries();
+	}
+
+	private function InitDictionnaries(){
+		clearstatcache();
+		$this->sDictionaryFolder = APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries";
+		@mkdir($this->sDictionaryFolder, 0777, true);
+
+		$sLabels = <<<STR
+        'label1' => 'fr1',
+STR;
+		$this->InitDictionnary($this->sDictionaryFolder, 'FR FR', 'fr-fr', $sLabels);
+
+		$sLabels = <<<STR
+        'label1' => 'ru1',
+        'label2' => 'ru2',
+STR;
+		$this->InitDictionnary($this->sDictionaryFolder, 'RU RU', 'ru-ru', $sLabels);
+		$sLabels = <<<STR
+        'label1' => 'en1',
+        'label2' => 'en2',
+        'label3' => 'en3',
+STR;
+		$this->InitDictionnary($this->sDictionaryFolder, 'EN US', 'en-us', $sLabels);
+
+		clearstatcache();
+	}
+
+	private function InitDictionnary($sDictionaryFolder, $sLanguageCode, $sLanguageCodeInFilename, $sLabels){
+		$sContent = <<<PHP
+<?php
+//
+// Dictionary built by the compiler for the language "FR FR"
+//
+Dict::SetEntries('$sLanguageCode', array(
+        $sLabels
+));
+PHP;
+		file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "$sLanguageCodeInFilename.dict.php", $sContent);
+	}
+
+	private function InitBrokenDictionnary($sDictionaryFolder, $sLanguageCode, $sLanguageCodeInFilename){
+		$sContent = <<<PHP
+<?php
+//
+// Dictionary built by the compiler for the language "FR FR"
+//
+Dict::SetEntries('$sLanguageCode', 'stringinsteadofanarray');
+PHP;
+		file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "$sLanguageCodeInFilename.dict.php", $sContent);
+	}
+
+	protected function tearDown()
+	{
+		foreach (glob(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries" . DIRECTORY_SEPARATOR . "*") as $sFile){
+			unlink($sFile);
+		}
+		rmdir(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries");
+		rmdir(APPROOT."env-$this->sEnvName");
+	}
+
+	public function InitLangIfNeeded_NoApcProvider(){
+		return [
+			'apcu mocked' => [ 'bApcuMocked' => true ],
+			'integration test - apcu service like in production - install php-apcu before' => [ 'bApcuMocked' => false ],
+		];
+	}
+
+	/**
+	 * @dataProvider InitLangIfNeeded_NoApcProvider
+	 */
+	public function testInitLangIfNeeded_NoApc($bApcuMocked){
+		if ($bApcuMocked) {
+			$this->oApcService->expects($this->any())
+				->method('function_exists')
+				->willReturn(false);
+
+			$this->oApcService->expects($this->never())
+				->method('apc_fetch');
+
+			$this->oApcService->expects($this->never())
+				->method('apc_store');
+		} else {
+			Dict::SetApcService(null);
+		}
+
+		//EN US default language
+		$this->assertEquals('en1', Dict::S('label1'));
+		$this->assertEquals('en2', Dict::S('label2'));
+		$this->assertEquals('en3', Dict::S('label3'));
+		$this->assertEquals('not_defined_label', Dict::S('not_defined_label'));
+
+		//default language set to RU RU
+		Dict::SetDefaultLanguage('RU RU');
+		$this->assertEquals('ru1', Dict::S('label1'));
+		$this->assertEquals('ru2', Dict::S('label2'));
+		$this->assertEquals('en3', Dict::S('label3'));
+		$this->assertEquals('not_defined_label', Dict::S('not_defined_label'));
+
+		//user language set to FR FR
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('fr1', Dict::S('label1'));
+		$this->assertEquals('ru2', Dict::S('label2'));
+		$this->assertEquals('en3', Dict::S('label3'));
+		$this->assertEquals('not_defined_label', Dict::S('not_defined_label'));
+	}
+
+	public function testInitLangIfNeeded_Apc_LanguageMismatchDictionnary(){
+		//language mismatch!!
+		$sLabels = <<<STR
+        'label1' => 'de1',
+STR;
+		$this->InitDictionnary($this->sDictionaryFolder, 'RU RU', 'de-de', $sLabels);
+
+		clearstatcache();
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(false);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_fetch');
+
+		$this->oApcService->expects($this->never())
+			->method('apc_store');
+
+		Dict::SetUserLanguage('DE DE');
+		$this->assertEquals('label1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_Apc_BrokenUserDictionnary(){
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'DE DE', 'de-de');
+
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(false);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_fetch');
+
+		$this->oApcService->expects($this->never())
+			->method('apc_store');
+
+		Dict::SetUserLanguage('DE DE');
+		$this->assertEquals('en1', Dict::S('label1'));
+
+		Dict::SetDefaultLanguage('RU RU');
+		$this->assertEquals('ru1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_Apc_BrokenDictionnary_UserAndDefault(){
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'DE DE', 'de-de');
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'RU RU', 'ru-ru');
+
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(false);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_fetch');
+
+		$this->oApcService->expects($this->never())
+			->method('apc_store');
+
+		Dict::SetUserLanguage('DE DE');
+		Dict::SetDefaultLanguage('RU RU');
+		$this->assertEquals('en1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_Apc_BrokenDictionnary_ALL(){
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'DE DE', 'de-de');
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'RU RU', 'ru-ru');
+		$this->InitBrokenDictionnary($this->sDictionaryFolder, 'EN US', 'en-us');
+
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(false);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_fetch');
+
+		$this->oApcService->expects($this->never())
+			->method('apc_store');
+
+		Dict::SetUserLanguage('DE DE');
+		Dict::SetDefaultLanguage('RU RU');
+		$this->assertEquals('label1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_ApcFromCache_PropertyInUserDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(1))
+			->method('apc_fetch')
+			->with('toto-dict-FR FR')
+			->willReturn(['label1' => 'fr1']);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_store');
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('fr1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_ApcStore_PropertyInUserDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(1))
+			->method('apc_fetch')
+			->with('toto-dict-FR FR')
+			->willReturn(false);
+
+		$this->oApcService->expects($this->exactly(1))
+			->method('apc_store')
+			->with('toto-dict-FR FR', ['label1' => 'fr1']);
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('fr1', Dict::S('label1'));
+	}
+
+	//corrupted data not fixed
+	//we will return label from another dictionary (defaut one => russian here)
+	public function testInitLangIfNeeded_Apc_CorruptedCache_PropertyInUserDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(2))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'])
+			->willReturnOnConsecutiveCalls('corrupteddata', ['label1' => 'ru1']);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_store');
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('ru1', Dict::S('label1'));
+	}
+
+	public function testInitLangIfNeeded_Apc_PropertyInDefaultLanguageDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(2))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'])
+			->willReturnOnConsecutiveCalls([], false);
+
+		$this->oApcService->expects($this->exactly(1))
+			->method('apc_store')
+			->withConsecutive(['toto-dict-RU RU', ['label1' => 'ru1', 'label2' => 'ru2']]
+			);
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('ru2', Dict::S('label2'));
+	}
+
+	//corrupted data not fixed
+	//we will return label from default language dictionary (EN here)
+	public function testInitLangIfNeeded_ApcCorrupted_PropertyInDefaultLanguageDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(3))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'], ['toto-dict-EN US'])
+			->willReturnOnConsecutiveCalls([], 'corrupteddata', ['label1' => 'en1', 'label2' => 'en2', 'label3' => 'en3']);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_store');
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('en2', Dict::S('label2'));
+	}
+
+	public function testInitLangIfNeeded_Apc_PropertyInDictDefaultLanguageDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(3))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'], ['toto-dict-EN US'])
+			->willReturnOnConsecutiveCalls([], [], false);
+
+		$this->oApcService->expects($this->exactly(1))
+			->method('apc_store')
+			->withConsecutive(
+				['toto-dict-EN US', ['label1' => 'en1', 'label2' => 'en2', 'label3' => 'en3']]
+			);
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('en3', Dict::S('label3'));
+	}
+
+	public function testInitLangIfNeeded_ApcCorrupted_PropertyInDictDefaultLanguageDictionnary(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(3))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'], ['toto-dict-EN US'])
+			->willReturnOnConsecutiveCalls([], [], 'corrupteddata');
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_store');
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('label3', Dict::S('label3'));
+	}
+
+	public function testInitLangIfNeeded_Apc_PropertyNotFound(){
+		$this->oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(true);
+
+		$this->oApcService->expects($this->exactly(3))
+			->method('apc_fetch')
+			->withConsecutive(['toto-dict-FR FR'], ['toto-dict-RU RU'], ['toto-dict-EN US'])
+			->willReturnOnConsecutiveCalls([], [], []);
+
+		$this->oApcService->expects($this->exactly(0))
+			->method('apc_store');
+
+		Dict::SetDefaultLanguage('RU RU');
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('undefined_label', Dict::S('undefined_label'));
+	}
+}

test/core/dictTest.php

@@ -38,12 +38,49 @@ use Exception;
  */
 class dictTest extends ItopTestCase
 {
+	private $sEnvName;
 	protected function setUp()
 	{
 		parent::setUp();
-		require_once (APPROOT.'core/coreexception.class.inc.php');
-		require_once (APPROOT.'core/dict.class.inc.php');
-		require_once 'mockDict.incphp';
+		require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'coreexception.class.inc.php');
+		require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'dict.class.inc.php');
+		require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'apc-service.class.inc.php');
+		$this->sEnvName = time();
+		$sDictionaryFolder = APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries";
+		@mkdir($sDictionaryFolder, 0777, true);
+
+		$sContent = <<<PHP
+<?php
+//
+// Dictionary built by the compiler for the language "FR FR"
+//
+Dict::SetEntries('FR FR', array(
+        'label1' => 'gabu',
+));
+PHP;
+		file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "fr-fr.dict.php", $sContent);
+		$sContent = <<<PHP
+<?php
+//
+// Dictionary built by the compiler for the language "FR FR"
+//
+Dict::SetEntries('EN EN', array(
+        'label1' => 'zomeu',
+));
+PHP;
+		file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "en-en.dict.php", $sContent);
+
+		$_SESSION['itop_env'] = $this->sEnvName;
+		//require_once 'mockDict.incphp';
+	}
+
+	protected function tearDown()
+	{
+		foreach (glob(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries" . DIRECTORY_SEPARATOR . "*") as $sFile){
+			unlink($sFile);
+		}
+		rmdir(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries");
+		rmdir(APPROOT."env-$this->sEnvName");
 	}
 
     /**
@@ -51,7 +88,32 @@ class dictTest extends ItopTestCase
      */
     public function testType()
 	{
+		$_SESSION['itop_env'] = 'production';
 		$this->assertInternalType('string', Dict::S('Core:AttributeURL'));
 		$this->assertInternalType('string', Dict::Format('Change:AttName_SetTo', '1', '2'));
 	}
+
+	public function testInitLangIfNeeded_NoApc(){
+    	$oApcService = $this->createMock(\ApcService::class);
+    	Dict::SetApcService($oApcService);
+    	Dict::EnableCache('toto');
+
+		$oApcService->expects($this->any())
+			->method('function_exists')
+			->willReturn(false);
+
+		$oApcService->expects($this->never())
+			->method('apc_fetch')
+			->willReturn(false);
+
+		$oApcService->expects($this->never())
+			->method('apc_store')
+			->willReturn(false);
+
+		Dict::SetLanguagesList(['FR FR' => 'fr', 'EN EN' => 'en']);
+		Dict::SetUserLanguage('FR FR');
+		$this->assertEquals('gabu', Dict::S('label1'));
+		Dict::SetUserLanguage('EN EN');
+		$this->assertEquals('zomeu', Dict::S('label1'));
+	}
 }