Merge pull request #5961 from christianbeeznest/alter-22234

Session: Fix session course position handling in CSV export/import - refs BT#22234

Author: NicoDucou

main/inc/lib/sessionmanager.lib.php

@@ -5084,7 +5084,7 @@ public static function importCSV(
                     }
                 }
 
-                $session_name = $enreg['SessionName'];
+                $session_name = trim(trim(api_utf8_decode($enreg['SessionName']), '"'));
 
                 if ($debug) {
                     $logger->addInfo('---------------------------------------');
@@ -5536,6 +5536,7 @@ public static function importCSV(
                     }
                 }
 
+                $position = 0;
                 foreach ($courses as $course) {
                     $courseArray = bracketsToArray($course);
                     $course_code = $courseArray[0];
@@ -5546,7 +5547,7 @@ public static function importCSV(
 
                         // Adding the course to a session.
                         $sql = "INSERT IGNORE INTO $tbl_session_course
-                                SET c_id = '$courseId', session_id='$session_id'";
+                                SET c_id = '$courseId', session_id='$session_id', position = '$position'";
                         Database::query($sql);
 
                         self::installCourse($session_id, $courseInfo['real_id']);
@@ -5934,6 +5935,7 @@ public static function importCSV(
                             }
                         }
                         $inserted_in_course[$course_code] = $courseInfo['title'];
+                        $position++;
                     }
                 }
                 $access_url_id = api_get_current_access_url_id();

main/session/session_export.php

@@ -162,10 +162,13 @@
             }
 
             // Courses
-            $sql = "SELECT DISTINCT c.code, sc.c_id
-                    FROM $tbl_course c
-                    INNER JOIN $tbl_session_course_user sc
-                    ON c.id = sc.c_id AND sc.session_id = '".$row['id']."'";
+            $sql = "SELECT DISTINCT c.code, sc.c_id, sr.position
+            FROM $tbl_course c
+            INNER JOIN $tbl_session_course_user sc
+                ON c.id = sc.c_id AND sc.session_id = '".$row['id']."'
+            INNER JOIN $tbl_session_course sr
+                ON sc.session_id = sr.session_id AND sc.c_id = sr.c_id
+            ORDER BY sr.position ASC";
 
             $rsCourses = Database::query($sql);
 

main/session/session_import.php

@@ -188,8 +188,7 @@
                     foreach ($root->Session as $node_session) {
                         $course_counter = 0;
                         $user_counter = 0;
-
-                        $session_name = trim(api_utf8_decode($node_session->SessionName));
+                        $session_name = trim(trim(api_utf8_decode($node_session->SessionName), '"'));
                         $coach = UserManager::purify_username(
                             api_utf8_decode($node_session->Coach),
                             $purification_option_for_usernames
@@ -345,6 +344,7 @@
                         }
 
                         // Adding courses to a session.
+                        $position = 0;
                         foreach ($node_session->Course as $node_course) {
                             $course_code = Database::escape_string(trim(api_utf8_decode($node_course->CourseCode)));
                             // Verify that the course pointed by the course code node exists.
@@ -357,7 +357,8 @@
                                 if (!$session_course_relation) {
                                     $sql_course = "INSERT INTO $tbl_session_course SET
                                             c_id = $courseId,
-                                            session_id = $session_id";
+                                            session_id = $session_id,
+                                            position = $position";
                                     $rs_course = Database::query($sql_course);
                                     SessionManager::installCourse($session_id, $courseId);
                                 }
@@ -408,6 +409,7 @@
                                 $sql = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE c_id='$courseId'";
                                 Database::query($sql);
                                 $inserted_in_course[$course_code] = $course_info['title'];
+                                $position++;
                             }
                         }
                         Database::query("UPDATE $tbl_session SET nbr_users='$user_counter', nbr_courses='$course_counter' WHERE id='$session_id'");