Use cid/sid instead of cidreq

public/main/exercise/TestCategory.php

@@ -263,7 +263,7 @@ class TestCategory
         $courseId = (int) $courseId;
         $categoryId = self::getCategoryForQuestion($questionId, $courseId);
         $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-        $sql = "SELECT title 
+        $sql = "SELECT title
                 FROM $table
                 WHERE id = $categoryId AND c_id = $courseId";
         $res = Database::query($sql);
@@ -1134,7 +1134,7 @@ class TestCategory
                 [
                     'id',
                     'name' => 'exercise/tests_category.php',
-                    'cidReq' => $course->getCode(),
+                    'cid' => $course->getId(),
                     'action' => 'editcategory',
                 ]
             );
@@ -1158,7 +1158,7 @@ class TestCategory
                 [
                     'id',
                     'name' => 'exercise/tests_category.php',
-                    'cidReq' => $course->getCode(),
+                    'cid' => $course->getId(),
                     'action' => 'deletecategory',
                 ]
             );

public/main/exercise/exercise_show.php

@@ -496,7 +496,7 @@ foreach ($questionList as $questionId) {
                                     $(function() {
                                         new HotspotQuestion({
                                             questionId: $questionId,
-                                            exerciseId: {$objExercise->id},                                            
+                                            exerciseId: {$objExercise->id},
                                             exeId: $id,
                                             selector: '#hotspot-solution-$questionId-$id',
                                             for: 'solution',
@@ -978,7 +978,6 @@ if ($isFeedbackAllowed && $origin != 'learnpath' && $origin != 'student_progress
             'exeid' => $id,
             'origin' => $origin,
             'details' => 'true',
-            'course' => Security::remove_XSS($_GET['cidReq']),
         ]);
 
         $emailForm = new FormValidator('form-email', 'post', $formUrl, '', ['id' => 'form-email']);

public/main/forum/index.php

@@ -226,8 +226,8 @@ $searchFilter = '';
 $translate = api_get_configuration_value('translate_html');
 if ($translate) {
     $form = new FormValidator('search_simple', 'get', api_get_self().'?'.api_get_cidreq(), null, null, 'inline');
-    $form->addHidden('cidReq', api_get_course_id());
-    $form->addHidden('id_session', api_get_session_id());
+    $form->addHidden('cid', api_get_course_int_id());
+    $form->addHidden('sid', api_get_session_id());
 
     $extraField = new ExtraField('forum_category');
     $returnParams = $extraField->addElements(

public/main/gradebook/exercise_jump.php

@@ -18,6 +18,7 @@ $this_section = SECTION_COURSES;
 
 $gradebook = Security::remove_XSS($_GET['gradebook']);
 $session_id = api_get_session_id();
+$courseId = api_get_course_int_id();
 $cidReq = Security::remove_XSS($_GET['cidReq']);
 $type = Security::remove_XSS($_GET['type']);
 $doExerciseUrl = '';
@@ -44,7 +45,7 @@ if (!empty($doExerciseUrl)) {
     exit;
 } else {
     $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'
-        .http_build_query(['session_id' => $session_id, 'cidReq' => $cidReq]);
+        .http_build_query(['sid' => $session_id, 'cid' => $courseId]);
     if (isset($_GET['gradebook'])) {
         $url .= '&gradebook=view&exerciseId='.((int) $_GET['exerciseId']);
 

public/main/gradebook/index.php

@@ -118,7 +118,7 @@ $(function() {
         $(this).addClass("view_children");
         $(this).find("img").attr("src", show_icon);
     });
-    
+
 	for (i=0;i<$(".actions").length;i++) {
 		if ($(".actions:eq("+i+")").html()=="<table border=\"0\"></table>" || $(".actions:eq("+i+")").html()=="" || $(".actions:eq("+i+")").html()==null || $(".actions:eq("+i+")").html().split("<TBODY></TBODY>").length==2) {
 			$(".actions:eq("+i+")").hide();
@@ -794,11 +794,7 @@ if (isset($_GET['studentoverview'])) {
     $addparams['studentoverview'] = '';
 }
 
-if (isset($_GET['cidReq']) && $_GET['cidReq'] != '') {
-    $addparams['cidReq'] = Security::remove_XSS($_GET['cidReq']);
-} else {
-    $addparams['cidReq'] = '';
-}
+$addparams['cid'] = api_get_course_int_id();
 
 $no_qualification = false;
 

public/main/gradebook/lib/be/exerciselink.class.php

@@ -58,13 +58,13 @@ class ExerciseLink extends AbstractLink
         $sql = 'SELECT iid, title FROM '.$exerciseTable.'
 				WHERE c_id = '.$this->course_id.' AND active=1  '.$session_condition;
 
-        $sqlLp = "SELECT e.iid, e.title 
-                  FROM $exerciseTable e 
+        $sqlLp = "SELECT e.iid, e.title
+                  FROM $exerciseTable e
                   INNER JOIN $lpItemTable i
                   ON (e.c_id = i.c_id AND e.id = i.path)
-				  WHERE 
-				    e.c_id = $this->course_id AND 
-				    active = 0 AND 
+				  WHERE
+				    e.c_id = $this->course_id AND
+				    active = 0 AND
 				    item_type = 'quiz'
 				  $session_condition";
 
@@ -102,7 +102,7 @@ class ExerciseLink extends AbstractLink
         $tbl_stats = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
         $sessionId = $this->get_session_id();
         $course_id = api_get_course_int_id($this->get_course_code());
-        $sql = "SELECT count(exe_id) AS number 
+        $sql = "SELECT count(exe_id) AS number
                 FROM $tbl_stats
                 WHERE
                     session_id = $sessionId AND
@@ -230,7 +230,7 @@ class ExerciseLink extends AbstractLink
                     $lpId = $lpId['lp_id'];
                 }
 
-                $sql = "SELECT * 
+                $sql = "SELECT *
                         FROM $tblStats
                         WHERE
                             exe_exo_id = $exerciseId AND
@@ -245,11 +245,11 @@ class ExerciseLink extends AbstractLink
             }
             $sql .= ' ORDER BY exe_id DESC';
         } else {
-            $sql = "SELECT * FROM $tblHp hp 
+            $sql = "SELECT * FROM $tblHp hp
                     INNER JOIN $tblDoc doc
                     ON (hp.exe_name = doc.path AND doc.c_id = hp.c_id)
                     WHERE
-                        hp.c_id = $courseId AND                        
+                        hp.c_id = $courseId AND
                         doc.id = $exerciseId";
 
             if (!empty($stud_id)) {
@@ -391,8 +391,8 @@ class ExerciseLink extends AbstractLink
             .http_build_query(
                 [
                     'path' => $path,
-                    'session_id' => $sessionId,
-                    'cidReq' => $this->get_course_code(),
+                    'sid' => $sessionId,
+                    'cid' => $this->getCourseId(),
                     'gradebook' => 'view',
                     'exerciseId' => $exerciseId,
                     'type' => $this->get_type(),

public/main/inc/ajax/exercise.ajax.php

@@ -20,7 +20,6 @@ if ($debug) {
 
 $course_id = api_get_course_int_id();
 $session_id = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : api_get_session_id();
-$course_code = isset($_REQUEST['cidReq']) ? $_REQUEST['cidReq'] : api_get_course_id();
 
 switch ($action) {
     case 'update_duration':

public/main/inc/ajax/model.ajax.php

@@ -627,9 +627,9 @@ switch ($action) {
         if (!empty($courseId)) {
             $courseInfo = api_get_course_info_by_id($courseId);
         } else {
-            $courseCode = isset($_REQUEST['cidReq']) ? $_REQUEST['cidReq'] : '';
-            if (!empty($courseCode)) {
-                $courseInfo = api_get_course_info($courseCode);
+            $courseId= isset($_REQUEST['cid']) ? $_REQUEST['cid'] : '';
+            if (!empty($courseId)) {
+                $courseInfo = api_get_course_info_by_id($courseId);
             }
         }