Tracking: Fix column position for email in report - refs BT#22304

Author: AngelFQC

main/inc/lib/TrackingCourseLog.php

@@ -951,6 +951,10 @@ public static function getUserData(
             $userRow['lp_finalization_date'] = $user['lp_finalization_date'];
             $userRow['quiz_finalization_date'] = $user['quiz_finalization_date'];
 
+            if (api_get_setting('show_email_addresses') === 'true') {
+                $userRow['email'] = $user['col4'];
+            }
+
             // we need to display an additional profile field
             if (isset($_GET['additional_profile_field'])) {
                 $data = Session::read('additional_user_profile_info');
@@ -991,10 +995,6 @@ public static function getUserData(
                 }
             }
 
-            if (api_get_setting('show_email_addresses') === 'true') {
-                $userRow['email'] = $user['col4'];
-            }
-
             $userRow['link'] = $user['link'];
 
             if ($GLOBALS['export_csv']) {

main/tracking/courseLog.php

@@ -779,30 +779,26 @@ function loadGraphs () {
     $table->set_header($headerCounter++, get_lang('QuizFinalizationDate'), false);
     $headers['quiz_finalization_date'] = get_lang('QuizFinalizationDate');
 
-    $counter = $headerCounter;
     if (api_get_setting('show_email_addresses') === 'true') {
-        $table->set_header($counter, get_lang('Email'), false);
+        $table->set_header($headerCounter++, get_lang('Email'), false);
         $headers['email'] = get_lang('Email');
-        $counter++;
     }
     if (isset($_GET['additional_profile_field'])) {
         foreach ($_GET['additional_profile_field'] as $fieldId) {
-            $table->set_header($counter, $extra_info[$fieldId]['display_text'], false);
+            $table->set_header($headerCounter++, $extra_info[$fieldId]['display_text'], false);
             $headers[$extra_info[$fieldId]['variable']] = $extra_info[$fieldId]['display_text'];
-            $counter++;
             $parameters['additional_profile_field'] = $fieldId;
         }
     }
     if (isset($defaultExtraFields)) {
         if (!empty($defaultExtraInfo)) {
             foreach ($defaultExtraInfo as $field) {
-                $table->set_header($counter, $field['display_text'], false);
+                $table->set_header($headerCounter++, $field['display_text'], false);
                 $headers[$field['variable']] = $field['display_text'];
-                $counter++;
             }
         }
     }
-    $table->set_header($counter, get_lang('Details'), false);
+    $table->set_header($headerCounter++, get_lang('Details'), false);
     $headers['Details'] = get_lang('Details');
 
     if (!empty($fields)) {