Sfoglia il codice sorgente

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

jmontoyaa 8 anni fa
parent
commit
e4ee840a07

+ 1 - 1
main/exercise/exercise.class.php

@@ -6792,7 +6792,7 @@ class Exercise
         //$this->loadQuestionAJAX = true;
 
         if ($generateJS && $this->loadQuestionAJAX) {
-            $url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_question&id='.$questionId;
+            $url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_question&id='.$questionId.'&'.api_get_cidreq();
             $params = array(
                 'questionId' => $questionId,
                 'attemptList'=> $attemptList,

+ 1 - 1
main/exercise/live_stats.php

@@ -38,7 +38,7 @@ Display::display_header(get_lang('StudentsWhoAreTakingTheExerciseRightNow'));
 //jqgrid will use this URL to do the selects
 
 $minutes = 60;
-$url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_live_stats&exercise_id='.$objExercise->id.'&minutes='.$minutes;
+$url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?'.api_get_cidreq().'&a=get_live_stats&exercise_id='.$objExercise->id.'&minutes='.$minutes;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
 $columns        = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score'));

+ 2 - 2
main/exercise/question_list_admin.inc.php

@@ -124,7 +124,7 @@ $ajax_url = api_get_path(WEB_AJAX_PATH)."exercise.ajax.php?".api_get_cidreq()."&
 
                     $pnlQuestion.html('<span class="fa fa-spinner fa-spin fa-3x fa-fw" aria-hidden="true"></span>');
 
-                    $.get('<?php echo api_get_path(WEB_AJAX_PATH) ?>exercise.ajax.php', {
+                    $.get('<?php echo api_get_path(WEB_AJAX_PATH) ?>exercise.ajax.php?<?php echo api_get_cidreq() ?>', {
                         a: 'show_question',
                         exercise: exerciseId,
                         question: questionId
@@ -237,7 +237,7 @@ if (!$inATest) {
                 if ($objExercise->edit_exercise_in_lp == true) {
                     $delete_link = '<a id="delete_'.$id.'" class="opener"  href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>';
                 }
-                
+
                 $edit_link = Display::tag('span', $edit_link,   array('class'=>'items'));
                 $clone_link = Display::tag('span', $clone_link,  array('class'=>'items'));
                 $delete_link = Display::tag('span', $delete_link, array('class'=>'items'));

+ 1 - 1
main/user/subscribe_user.php

@@ -699,7 +699,7 @@ function reg_filter($user_id)
     }
     $user_id = (int) $user_id;
 
-	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.
+	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?'.api_get_cidreq().'&register=yes&type='.$type.'&user_id='.$user_id.'">'.
         get_lang("reg").'</a>';
 
 	return $result;