Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	js/wizardhelper.js

datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php

@@ -440,9 +440,9 @@ class ObjectFormHandlerHelper
 	/**
 	 * Check if read object include in form data is allowed, throw an exception otherwise.
 	 *
-	 * @since 2.7.7
+	 * @since 2.7.7 3.0.2 3.1.0
 	 *
-	 * @param $sFormManagerData form data to check
+	 * @param string $sFormManagerData form data to check
 	 *
 	 * @return void
 	 * @throws \CoreException
@@ -451,7 +451,8 @@ class ObjectFormHandlerHelper
 	 * @throws \MySQLHasGoneAwayException
 	 * @throws \OQLException
 	 */
-	public function CheckReadFormDataAllowed($sFormManagerData){
+	public function CheckReadFormDataAllowed($sFormManagerData)
+	{
 		$aJsonFromData = ObjectFormManager::DecodeFormManagerData($sFormManagerData);
 		if(isset($aJsonFromData['formobject_class'])
 			&& isset($aJsonFromData['formobject_id'])

dictionaries/fr.dictionary.itop.ui.php

@@ -461,7 +461,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:Error:MaintenanceTitle' => 'Maintenance',
 	'UI:Error:InvalidToken' => 'Erreur: l\'opération a déjà été effectuée (CSRF token not found)',
 
-	'UI:Error:SMTP:UnknownVendor' => 'Le provider SMTP Oauth 2.0 %1$s n\'existe pas',
+	'UI:Error:SMTP:UnknownVendor' => 'Le provider SMTP OAuth 2.0 %1$s n\'existe pas',
 
 	'UI:GroupBy:Count' => 'Nombre',
 	'UI:GroupBy:Count+' => 'Nombre d\'éléments',

js/wizardhelper.js

@@ -242,8 +242,8 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 
 		this.ResetQuery();
 		this.UpdateWizard();
-		var fieldForm=null;
-		while (index < aFieldNames.length)
+		var fieldForm = null;
+		while (index < aFieldNames.length )
 		{
 			sAttCode = aFieldNames[index];
 			sFieldId = this.GetFieldId(sAttCode);
@@ -255,7 +255,7 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
 					message: '',
 					overlayCSS: {backgroundColor: '#f1f1f1', opacity: 0.3}
 				});
-				fieldForm=$('#field_' + sFieldId).closest('form');
+				fieldForm = $('#field_' + sFieldId).closest('form');
 				this.RequestAllowedValues(sAttCode);
 			}
 			index++;

setup/wizardsteps.class.inc.php

@@ -695,6 +695,11 @@ class WizStepLicense extends WizardStep
 		return array('class' => 'WizStepDBParams', 'state' => '');
 	}
 
+	/**
+	 * @return bool
+	 * @throws \Exception
+	 * @since 2.7.7 3.0.2 3.1.0
+	 */
 	private function NeedsRgpdConsent()
 	{
 		$sMode = $this->oWizard->GetParameter('install_mode');