Use cid/sid instead of cidreq

public/main/exercise/TestCategory.php

@@ -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

@@ -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('cid', api_get_course_int_id());
-    $form->addHidden('id_session', api_get_session_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

@@ -794,11 +794,7 @@ if (isset($_GET['studentoverview'])) {
     $addparams['studentoverview'] = '';
 }
 
-if (isset($_GET['cidReq']) && $_GET['cidReq'] != '') {
+$addparams['cid'] = api_get_course_int_id();
-    $addparams['cidReq'] = Security::remove_XSS($_GET['cidReq']);
-} else {
-    $addparams['cidReq'] = '';
-}
 
 $no_qualification = false;
 

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

@@ -391,8 +391,8 @@ class ExerciseLink extends AbstractLink
             .http_build_query(
                 [
                     'path' => $path,
-                    'session_id' => $sessionId,
+                    'sid' => $sessionId,
-                    'cidReq' => $this->get_course_code(),
+                    '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'] : '';
+            $courseId= isset($_REQUEST['cid']) ? $_REQUEST['cid'] : '';
-            if (!empty($courseCode)) {
+            if (!empty($courseId)) {
-                $courseInfo = api_get_course_info($courseCode);
+                $courseInfo = api_get_course_info_by_id($courseId);
             }
         }