Add course URL in lp ajax calls see BT#13168

main/lp/lp_ajax_save_item.php

@@ -69,7 +69,15 @@ function save_item(
         error_log("finish: $lmsFinish - navigatesAway: $userNavigatesAway");
     }
 
-    $myLP = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
+    $courseCode = api_get_course_id();
+    if (!empty($courseId)) {
+        $courseInfo = api_get_course_info_by_id($courseId);
+        if ($courseInfo) {
+            $courseCode = $courseInfo['code'];
+        }
+    }
+
+    $myLP = learnpath::getLpFromSession($courseCode, $lp_id, $user_id);
 
     if (!is_a($myLP, 'learnpath')) {
         if ($debug) {
@@ -78,7 +86,6 @@ function save_item(
 
         return null;
     }
-
     $prerequisitesCheck = $myLP->prerequisites_match($item_id);
 
     /** @var learnpathItem $myLPI */

main/lp/scorm_api.php

@@ -205,9 +205,10 @@ if (olms.score == 0 && olms.lms_item_type == 'sco' && olms.lesson_status == 'not
 olms.asset_timer = 0;
 olms.userfname = '<?php echo str_replace("'", "\\'", $user['firstname']); ?>';
 olms.userlname = '<?php echo str_replace("'", "\\'", $user['lastname']); ?>';
-
 olms.execute_stats = false;
 
+var courseUrl = '?cidReq='+olms.lms_course_code+'&id_session='+olms.lms_session_id;
+
 /**
  * Add the "addListeners" function to the "onload" event of the window and
  * start the timer if necessary (asset)
@@ -293,7 +294,7 @@ function LMSInitialize() {
 
         $.ajax({
             type: "POST",
-            url: "lp_ajax_initialize.php",
+            url: "lp_ajax_initialize.php" + courseUrl,
             data: params,
             dataType: 'script',
             async: false,
@@ -1363,8 +1364,11 @@ function update_progress_bar(nbr_complete, nbr_total, mode) {
 /**
  * Update the gamification values (number of stars and score)
  */
-function updateGamificationValues() {
-    var fetchValues = $.ajax('<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php', {
+function updateGamificationValues()
+{
+    var fetchValues = $.ajax(
+        '<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php?' + courseUrl,
+        {
         dataType: 'json',
         data: {
             a: 'update_gamification'
@@ -1648,7 +1652,7 @@ function switch_item(current_item, next_item){
     //(4) refresh the audio player if needed
     $.ajax({
         type: "POST",
-        url: "lp_nav.php",
+        url: "lp_nav.php"+courseUrl,
         data: {
             lp_item: next_item
         },
@@ -1676,7 +1680,9 @@ function switch_item(current_item, next_item){
  * Hide or show the navigation buttons if the current item is the First or Last
  */
 var checkCurrentItemPosition = function(lpItemId) {
-    var currentItem = $.getJSON('<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php', {
+    var currentItem = $.getJSON(
+        '<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php' + courseUrl,
+    {
         a: 'check_item_position',
         lp_item: lpItemId
     }
@@ -1703,7 +1709,8 @@ var checkCurrentItemPosition = function(lpItemId) {
  * Get a forum info when the learning path item has a associated forum
  */
 var loadForumThread = function(lpId, lpItemId) {
-    var loadForum = $.getJSON('<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php', {
+    var loadForum = $.getJSON(
+        '<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php' + courseUrl, {
             a: 'get_forum_thread',
             lp: lpId,
             lp_item: lpItemId
@@ -1821,7 +1828,7 @@ function xajax_save_item(
         $.ajax({
             type:"POST",
             data: params,
-            url: "lp_ajax_save_item.php",
+            url: "lp_ajax_save_item.php" + courseUrl,
             dataType: "script",
             async: false
         });
@@ -1935,7 +1942,7 @@ function xajax_save_item_scorm(
     $.ajax({
         type:"POST",
         data: params,
-        url: "lp_ajax_save_item.php",
+        url: "lp_ajax_save_item.php" + courseUrl,
         dataType: "script",
         async: false
     });
@@ -1953,7 +1960,7 @@ function xajax_start_timer() {
     logit_lms('xajax_start_timer() called',3);
     $.ajax({
         type: "GET",
-        url: "lp_ajax_start_timer.php",
+        url: "lp_ajax_start_timer.php" + courseUrl,
         dataType: "script",
         async: false,
         success: function(time) {
@@ -1997,7 +2004,7 @@ function xajax_save_objectives(lms_lp_id,lms_user_id,lms_view_id,lms_item_id,ite
     $.ajax({
         type: "POST",
         data: params,
-        url: "lp_ajax_save_objectives.php",
+        url: "lp_ajax_save_objectives.php" + courseUrl,
         dataType: "script",
         async: false
     });
@@ -2027,7 +2034,7 @@ function xajax_switch_item_details(lms_lp_id,lms_user_id,lms_view_id,lms_item_id
     $.ajax({
         type: "POST",
         data: params,
-        url: "lp_ajax_switch_item.php",
+        url: "lp_ajax_switch_item.php" + courseUrl,
         dataType: "script",
         async: false
     });
@@ -2056,7 +2063,7 @@ function xajax_switch_item_toc(lms_lp_id, lms_user_id, lms_view_id, lms_item_id,
     $.ajax({
         type: "POST",
         data: params,
-        url: "lp_ajax_switch_item_toc.php",
+        url: "lp_ajax_switch_item_toc.php" + courseUrl,
         dataType: "script",
         async: false
     });
@@ -2086,7 +2093,7 @@ function attach_glossary_into_scorm(type) {
     my_protocol = location.protocol;
     my_pathname=location.pathname;
     work_path = my_pathname.substr(0,my_pathname.indexOf('<?php echo api_get_path(REL_COURSE_PATH) ?>'));
-    var ajaxRequestUrl = '<?php echo api_get_path(WEB_CODE_PATH).'glossary/glossary_ajax_request.php'; ?>';
+    var ajaxRequestUrl = '<?php echo api_get_path(WEB_CODE_PATH).'glossary/glossary_ajax_request.php'; ?>' + courseUrl;
 
     if (type == 'automatic') {
         $.ajax({

main/template/default/glossary/glossary_auto.js.tpl

@@ -2,9 +2,8 @@
 $(document).ready(function() {
     $(window).load(function () {
 {% endif %}
-
     var my_text = $(".glossary-content").html();
-        var ajaxRequestUrl = "{{ _p.web }}main/glossary/glossary_ajax_request.php";
+    var ajaxRequestUrl = "{{ _p.web }}main/glossary/glossary_ajax_request.php?{{ _p.web_cid_query }}";
     var imageSource = "{{ _p.web }}main/inc/lib/javascript/indicator.gif";
     var indicatorImage ='<img src="' + imageSource + '" />';
 

main/template/default/glossary/glossary_manual.js.tpl

@@ -1,11 +1,10 @@
-var ajaxRequestUrl = "{{ _p.web }}main/glossary/glossary_ajax_request.php";
+var ajaxRequestUrl = "{{ _p.web }}main/glossary/glossary_ajax_request.php?{{ _p.web_cid_query }}";
 var imageSource = "{{ _p.web_main }}" + "inc/lib/javascript/indicator.gif";
 var indicatorImage ='<img src="' + imageSource + '" />';
 
 {% if add_ready %}
 $(document).ready(function() {
 {% endif %}
-
     $("body").on("click", ".glossary", function() {
         is_glossary_name = $(this).html();
         random_id = Math.round(Math.random()*100);
@@ -27,7 +26,7 @@ $(document).ready(function() {
                 $("div#"+div_content_id).remove();
             }
         });
-        var indicator =
+
         $.ajax({
             contentType: "application/x-www-form-urlencoded",
             beforeSend: function(result) {

main/template/default/learnpath/view.tpl

@@ -292,7 +292,7 @@
                         {type: 'stylesheet', id: '_fr5', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css'},
                         {type: 'stylesheet', id: '_fr6', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/theme.css'},
                         {type: 'script', id: '_fr2', src: '{{ _p.web_lib }}javascript/jquery.highlight.js'},
-                        {type: 'script', id: '_fr3', src: '{{ _p.web_main }}glossary/glossary.js.php'}
+                        {type: 'script', id: '_fr3', src: '{{ _p.web_main }}glossary/glossary.js.php?{{ _p.web_cid_req }}'}
                     ]
                 });
             });