Merge pull request #7500 from christianbeeznest/GH-7459-2

User: Use registration.allow_double_validation_in_registration for double validation - refs #7459

Author: christianbeeznest

public/main/auth/registration.php

@@ -1199,16 +1199,15 @@ function ($email) {
     );
 } else {
     $allow = ('true' === api_get_setting('registration.allow_double_validation_in_registration'));
-    $termsEnabled = ('true' === api_get_setting('allow_terms_conditions'));
 
     ChamiloHelper::addLegalTermsFields($form, $userAlreadyRegisteredShowTerms);
 
     /**
-     * The "double validation" (Validate -> Register) is legacy UX.
-     * When Terms & Conditions are enabled, it becomes redundant and may create a confusing 2-step flow.
-     * Keep it only for platforms that explicitly want it without T&C.
+     * Double validation must be controlled ONLY by:
+     * registration.allow_double_validation_in_registration
+     * It must not depend on Terms & Conditions activation.
      */
-    if ($allow && !$termsEnabled && !$termActivated) {
+    if ($allow && !$termActivated) {
         $htmlHeadXtra[] = '<script>
             $(document).ready(function() {
                 $("#pre_validation").click(function() {
@@ -1479,6 +1478,7 @@ function ($email) {
     $user['mail'] = $values['email'];
     $user['language'] = $values['language'];
     $user['user_id'] = $userId;
+    $user['id'] = $userId;
     Session::write('_user', $user);
 
     $is_allowedCreateCourse = isset($values['status']) && 1 == $values['status'];
@@ -1509,6 +1509,7 @@ function ($email) {
         'mail' => $values['email'],
         'language' => $values['language'],
         'user_id' => $userId,
+        'id' => $userId,
     ];
 
     $sessionHandler->set('_user', $userData);

public/main/inc/lib/course.lib.php

@@ -6203,7 +6203,7 @@ public static function redirectToCourse($form_data)
     {
         $courseIdRedirect = Session::read('course_redirect');
         $_user = api_get_user_info();
-        $userId = $_user['id'];
+        $userId = (int) ($_user['id'] ?? ($_user['user_id'] ?? 0));
 
         if (!empty($courseIdRedirect)) {
             $course_info = api_get_course_info_by_id($courseIdRedirect);