User: Fix Validation of StartingPoint in Legacy

Author: kergomard

components/ILIAS/User/classes/class.ilObjUserGUI.php

@@ -338,7 +338,12 @@ public function saveObject(): void
         $profile_maybe_incomplete = $this->retrieveAllowIncompleteProfileFromPost();
         $this->initForm(!$profile_maybe_incomplete, null);
 
-        if (!$this->form_gui->checkInput()) {
+        if (!$this->form_gui->checkInput()
+            || !$this->user_settings->performAdditionalChecks(
+                $this->tpl,
+                $this->form_gui
+            )
+        ) {
             $this->form_gui->setValuesByPost();
             $this->renderForm();
             return;
@@ -430,7 +435,10 @@ public function updateObject(): void
         $this->initForm(!$profile_maybe_incomplete, $this->object);
 
         if (!$this->form_gui->checkInput()
-            || !$this->isAccessRangeInputValid()) {
+            || !$this->user_settings->performAdditionalChecks(
+                $this->tpl,
+                $this->form_gui
+            ) || !$this->isAccessRangeInputValid()) {
             $this->form_gui->setValuesByPost();
             $this->tabs_gui->activateTab('properties');
             $this->renderForm();

components/ILIAS/User/src/LocalDIC.php

@@ -73,7 +73,6 @@ private function init(ILIASContainer $DIC): void
             new UserSettingsImplementation(
                 $DIC['lng'],
                 $DIC['ilSetting'],
-                $DIC['tpl'],
                 $DIC['ui.factory'],
                 $DIC['refinery'],
                 $c[UserSettingsConfigurationRepository::class],

components/ILIAS/User/src/Settings/SettingsImplementation.php

@@ -30,7 +30,6 @@ class SettingsImplementation implements Settings
     public function __construct(
         private readonly Language $lng,
         private readonly \ilSetting $settings,
-        private readonly \ilGlobalTemplateInterface $tpl,
         private readonly UIFactory $ui_factory,
         private readonly Refinery $refinery,
         private readonly ConfigurationRepository $user_settings_configuration_repository,
@@ -105,9 +104,13 @@ public function addSectionsToLegacyForm(
     }
 
     public function performAdditionalChecks(
+        \ilGlobalTemplateInterface $tpl,
         \ilPropertyFormGUI $form
     ): bool {
-        return $this->checkStartingPointValue($form);
+        return $this->checkStartingPointValue(
+            $tpl,
+            $form
+        );
     }
 
     /**
@@ -366,9 +369,17 @@ private function retrieveValuefromInputs(
         return $form[$section_key][$setting->getIdentifier()];
     }
 
-    private function checkStartingPointValue(\ilPropertyFormGUI $form): bool
-    {
+    private function checkStartingPointValue(
+        \ilGlobalTemplateInterface $tpl,
+        \ilPropertyFormGUI $form
+    ): bool {
         return $form->getInput('additional') === ''
-            || $this->user_settings_configuration_repository->getByIdentifier('starting_point')->validateUserChoice($this->tpl, $this->lng, $form);
+            || $this->user_settings_configuration_repository
+                ->getByIdentifier('starting_point')
+                ->validateUserChoice(
+                    $tpl,
+                    $this->lng,
+                    $form
+                );
     }
 }

components/ILIAS/User/src/Settings/StartingPoint/Setting.php

@@ -225,7 +225,7 @@ public function validateUserChoice(
         Language $lng,
         \ilPropertyFormGUI $form
     ): bool {
-        if ($form->getInput($this->getIdentifier()) !== Repository::START_REPOSITORY_OBJ) {
+        if ((int) $form->getInput($this->getIdentifier()) !== Repository::START_REPOSITORY_OBJ) {
             return true;
         }
 
@@ -244,7 +244,7 @@ private function buildValidateObjectConstraint(
     ): CustomConstraint {
         return $refinery->custom()->constraint(
             function (array $v): bool {
-                if ($v[0] !== Repository::START_REPOSITORY_OBJ) {
+                if ((int) $v[0] !== Repository::START_REPOSITORY_OBJ) {
                     return true;
                 }
                 if (!is_int($v[1]['usr_start_ref_id']) || !\ilObject::_exists($v[1]['usr_start_ref_id'], true)) {