Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

main/cron/import_csv.php

@@ -1440,7 +1440,7 @@ class ImportCsv
                     $externalCareerIds = [];
                     if (substr($externalCareerIdList, 0, 1) === '[') {
                         $externalCareerIdList = substr($externalCareerIdList, 1, -1);
-                        $externalCareerIds = preg_split('/,/',$externalCareerIdList);
+                        $externalCareerIds = preg_split('/,/', $externalCareerIdList);
                     } else {
                         $externalCareerIds = [$externalCareerIdList];
                     }

main/exercise/exercise.class.php

@@ -7939,6 +7939,7 @@ class Exercise
         if (empty($this->exerciseCategoryId)) {
             return null;
         }
+
         return (int) $this->exerciseCategoryId;
     }
 
@@ -7948,7 +7949,7 @@ class Exercise
     public function setExerciseCategoryId($value)
     {
         if (!empty($value)) {
-            $this->exerciseCategoryId = (int)$value;
+            $this->exerciseCategoryId = (int) $value;
         }
     }
 
@@ -8372,6 +8373,7 @@ class Exercise
      * Return an HTML table of exercises for on-screen printing, including
      * action icons. If no exercise is present and the user can edit the
      * course, show a "create test" button.
+     *
      * @param int    $categoryId
      * @param string $keyword
      *

main/mySpace/access_details_session.php

@@ -155,7 +155,7 @@ if ($form->validate()) {
 
                     // Partials
                     $partialDuration += $item['duration'];
-/*
+                    /*
                                         if (empty($partialMinLogin)) {
                                             $partialMinLogin = api_strtotime($item['login'], 'UTC');
                                         }
@@ -222,7 +222,7 @@ if ($form->validate()) {
 
             // Partials
             $partialDuration += $item['duration'];
-/*
+            /*
                         if (empty($partialMinLogin)) {
                             $partialMinLogin = api_strtotime($item['login'], 'UTC');
                         }
@@ -236,7 +236,7 @@ if ($form->validate()) {
         }
 
         if (!empty($result)) {
-/*
+            /*
                         $record = [
                             customDate($partialMinLogin, true),
                             customDate($partialMaxLogin, true),
@@ -249,7 +249,6 @@ if ($form->validate()) {
                 api_format_time($partialDuration, 'js'),
             ];
 
-
             $report[0]['courses'][$course['course_id']][] = $record;
             $report[0]['name'][$course['course_id']] = $course['title'];
         }