N°7662 Allowing indentation and de-indentation

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php
#	datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php

core/htmlsanitizer.class.inc.php

@@ -354,6 +354,8 @@ class HTMLDOMSanitizer extends DOMSanitizer
 		'font-style',
 		'height',
 		'margin',
+		'margin-left',
+		'margin-right',
 		'padding',
 		'text-align',
 		'vertical-align',

datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php

@@ -152,7 +152,7 @@ class UserProfileBrickController extends BrickController
 				// Preparing forms
 				$aData['forms']['contact'] = $this->ObjectFormHandlerHelper->HandleForm($oRequest, $sFormMode, $sCurContactClass,
 					$sCurContactId,
-					$oBrick->GetForm());
+				);
 				$aData['forms']['preferences'] = $this->HandlePreferencesForm($oRequest, $sFormMode);
 				// - If user can change password, we display the form
 				$aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $sFormMode) : null;
@@ -428,7 +428,7 @@ class UserProfileBrickController extends BrickController
 					'sObjectField' => $sPictureAttCode,
 					'cache' => 86400,
 					's' => $oOrmDoc->GetSignature(),
-					]);
+				]);
 				$aFormData['validation'] = array(
 					'valid' => true,
 					'messages' => array(),

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

@@ -124,17 +124,15 @@ class ObjectFormHandlerHelper
 	 * @throws \OQLException
 	 * @throws \Exception
 	 */
-	public function HandleForm(Request $oRequest, $sMode, $sObjectClass, $sObjectId = null, $aFormProperties = null)
+	public function HandleForm(Request $oRequest, $sMode, $sObjectClass, $sObjectId = null, array $aFormProperties = null)
 	{
 		$aFormData = array();
 		$sOperation = $this->oRequestManipulator->ReadParam('operation', '');
 		$bModal = ($oRequest->isXmlHttpRequest() && empty($sOperation));
 
 		// - Retrieve form properties
-		if ($aFormProperties === null)
-		{
-			$aFormProperties = ApplicationHelper::GetLoadedFormFromClass($this->aCombodoPortalInstanceConf['forms'], $sObjectClass, $sMode);
-		}
+		$aFormProperties = $aFormProperties ?? ApplicationHelper::GetLoadedFormFromClass($this->aCombodoPortalInstanceConf['forms'], $sObjectClass, $sMode);
+
 		// - Create and
 		if (empty($sOperation))
 		{
@@ -281,7 +279,8 @@ class ObjectFormHandlerHelper
 				->SetActionRulesToken($sActionRulesToken)
 				->SetRenderer($oFormRenderer)
 				->SetFormProperties($aFormProperties);
-
+			$oFormManager->PrepareFormAndHTMLDocument();
+			$oFormManager->PrepareFields();
 			$oFormManager->Build();
 			$aFormData['hidden_fields'] = $oFormManager->GetHiddenFieldsId();
 			// Check the number of editable fields

node_modules/.package-lock.json

@@ -71,7 +71,7 @@
     },
     "node_modules/ckeditor5-itop-build": {
       "version": "3.2.0",
-      "resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
+      "resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
       "license": "SEE LICENSE IN LICENSE.md"
     },
     "node_modules/clipboard": {

package-lock.json

@@ -104,7 +104,7 @@
     },
     "node_modules/ckeditor5-itop-build": {
       "version": "3.2.0",
-      "resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
+      "resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
       "license": "SEE LICENSE IN LICENSE.md"
     },
     "node_modules/clipboard": {
@@ -357,8 +357,8 @@
       }
     },
     "ckeditor5-itop-build": {
-      "version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#7dcf9fc9b0010e121f1d8a4d28eca0219fcb6e35",
-      "from": "ckeditor5-itop-build@https://github.com/Combodo/ckeditor5-itop-build.git"
+      "version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
+      "from": "ckeditor5-itop-build@github:Combodo/ckeditor5-itop-build"
     },
     "clipboard": {
       "version": "2.0.11",

setup/unattended-install/unattended-install.php

@@ -26,6 +26,8 @@ EOF;
 }
 /////////////////////////////////////////////////
 
+$oCtx = new ContextTag(ContextTag::TAG_SETUP);
+
 $sCleanName = strtolower(trim(PHP_SAPI));
 if ($sCleanName !== 'cli')
 {