Using absolut URL paths

skala
Julio Montoya 13 years ago
parent 647f441934
commit 4f2721953d
  1. 4
      main/document/document_slideshow.inc.php
  2. 26
      main/exercice/admin.php
  3. 8
      main/exercice/adminhp.php
  4. 10
      main/exercice/answer_admin.inc.php
  5. 5
      main/exercice/exercice.php
  6. 10
      main/exercice/exercise.class.php
  7. 8
      main/exercice/exercise_reminder.php
  8. 12
      main/exercice/exercise_report.php
  9. 2
      main/exercice/exercise_result.php
  10. 4
      main/exercice/exercise_show.php
  11. 33
      main/exercice/exercise_submit.php
  12. 12
      main/exercice/exercise_submit_modal.php
  13. 2
      main/exercice/hotpotatoes_exercise_report.php
  14. 2
      main/exercice/hotspot_admin.inc.php
  15. 6
      main/exercice/overview.php
  16. 8
      main/exercice/question_admin.inc.php
  17. 4
      main/exercice/showinframes.php
  18. 5
      main/exercice/upload_exercise.php
  19. 8
      main/inc/ajax/exercise.ajax.php
  20. 39
      main/inc/lib/exercise_show_functions.lib.php

@ -70,8 +70,10 @@ $image_files_only = sort_files($array_to_search);
$_SESSION['image_files_only'] = $image_files_only;
function sort_files($table) {
global $tablename_direction, $accepted_extensions;
if (!is_array($accepted_extensions)) {
$accepted_extensions = array();
}
$temp = array();
foreach ($table as & $file_array) {

@ -58,6 +58,8 @@ require_once 'answer.class.php';
$language_file = 'exercice';
require_once '../inc/global.inc.php';
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
$current_course_tool = TOOL_QUIZ;
$this_section = SECTION_COURSES;
@ -215,7 +217,7 @@ if (!empty($cancelExercise)) {
} else {
// new exercise
// goes back to the exercise list
header('Location: exercice.php');
header('Location: '.$urlMainExercise.'exercice.php');
exit();
}
}
@ -225,7 +227,7 @@ if (!empty($cancelQuestion)) {
// if we are creating a new question from the question pool
if (!$exerciseId && !$questionId) {
// goes back to the question pool
header('Location: question_pool.php');
header('Location: '.$urlMainExercise.'question_pool.php');
exit();
} else {
// goes back to the question viewing
@ -251,7 +253,7 @@ if (!empty($clone_question) && !empty($objExercise->id)) {
// Reloading tne $objExercise obj
$objExercise->read($objExercise->id);
header('Location: admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id);
header('Location: '.$urlMainExercise.'admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id);
exit;
}
@ -280,9 +282,9 @@ if (!empty($gradebook) && $gradebook == 'view') {
);
}
$interbreadcrumb[] = array("url" => "exercice.php", "name" => get_lang('Exercices'));
$interbreadcrumb[] = array("url" => $urlMainExercise."exercice.php", "name" => get_lang('Exercices'));
if (isset($_GET['newQuestion']) || isset($_GET['editQuestion'])) {
$interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
$interbreadcrumb[] = array("url" => $urlMainExercise."admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
} else {
$interbreadcrumb[] = array("url" => "#", "name" => $objExercise->name);
}
@ -471,7 +473,7 @@ $inATest = isset($exerciseId) && $exerciseId > 0;
if ($inATest) {
echo '<div class="actions">';
if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) {
echo '<a href="admin.php?exerciseId='.$exerciseId.'">'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'admin.php?exerciseId='.$exerciseId.'">'.Display::return_icon(
'back.png',
get_lang('GoBackToQuestionList'),
'',
@ -480,14 +482,14 @@ if ($inATest) {
}
if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['myid']) && !isset($_GET['editQuestion'])) {
echo '<a href="exercice.php?'.api_get_cidReq().'">'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'exercice.php?'.api_get_cidReq().'">'.Display::return_icon(
'back.png',
get_lang('BackToExercisesList'),
'',
ICON_SIZE_MEDIUM
).'</a>';
}
echo '<a href="overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&preview=1">'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&preview=1">'.Display::return_icon(
'preview_view.png',
get_lang('Preview'),
'',
@ -496,7 +498,7 @@ if ($inATest) {
echo Display::url(
Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_MEDIUM),
'exercise_report.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id
$urlMainExercise.'exercise_report.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id
);
if ($objExercise->edit_exercise_in_lp == false) {
@ -507,7 +509,7 @@ if ($inATest) {
ICON_SIZE_MEDIUM
).'</a>';
} else {
echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.Display::return_icon(
'settings.png',
get_lang('ModifyExercise'),
'',
@ -532,7 +534,7 @@ if ($inATest) {
if (isset($_GET['newQuestion'])) {
// we are in create a new question from question pool not in a test
echo '<div class="actions">';
echo '<a href="admin.php?'.api_get_cidreq().'">.'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'admin.php?'.api_get_cidreq().'">.'.Display::return_icon(
'back.png',
get_lang('GoBackToQuestionList'),
'',
@ -542,7 +544,7 @@ if ($inATest) {
} else {
// If we are in question_poolbut not in an test, go back to question create in pool
echo '<div class="actions">';
echo '<a href="question_pool.php">'.Display::return_icon(
echo '<a href="'.$urlMainExercise.'question_pool.php">'.Display::return_icon(
'back.png',
get_lang('GoBackToQuestionList'),
'',

@ -62,8 +62,9 @@ $nameTools = get_lang('adminHP');
Display::display_header($nameTools,"Exercise");
/** @todo probably wrong !!!! */
require_once(api_get_path(SYS_CODE_PATH).'/exercice/hotpotatoes.lib.php');
require_once api_get_path(SYS_CODE_PATH).'/exercice/hotpotatoes.lib.php';
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
?>
<h4>
@ -75,15 +76,14 @@ if (isset($newName)) {
if ($newName!="") {
//alter database record for that test
SetComment($hotpotatoesName,$newName);
echo "<script language='Javascript' type='text/javascript'> window.location='exercice.php'; </script>";
echo "<script type='text/javascript'>window.location='".$urlMainExercise."exercice.php'; </script>";
}
}
echo "<form action=\"".api_get_self()."\" method='post' name='form1'>";
echo "<form action=\"".$urlMainExercise."adminhp.php\" method='post' name='form1'>";
echo "<input type=\"hidden\" name=\"hotpotatoesName\" value=\"$hotpotatoesName\">";
echo "<input type=\"text\" name=\"newName\" value=\"";
$lstrComment = "";
$lstrComment = GetComment($hotpotatoesName);
if ($lstrComment=="") {

@ -17,6 +17,8 @@ if (!is_object($objQuestion)) {
$objQuestion = Question :: read($_GET['modifyAnswers']);
}
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
$questionName = $objQuestion->selectTitle();
$answerType = $objQuestion->selectType();
$pictureName = $objQuestion->selectPicture();
@ -147,7 +149,7 @@ if ($submitAnswers || $buttonBack) {
} else {
// adds the answer into the object
$objAnswer->createAnswer($reponse[$i], $goodAnswer, $comment[$i], $weighting[$i], $i);
$mainurl = "admin.php";
$mainurl = $urlMainExercise."admin.php";
?>
<script>
window.location.href='<?php echo $mainurl; ?>';
@ -216,7 +218,7 @@ if ($submitAnswers || $buttonBack) {
$objAnswer->createAnswer($reponse, 0, '', 0, '');
$objAnswer->save();
//added
$mainurl = "admin.php";
$mainurl = $urlMainExercise."admin.php";
?>
<script>
window.location.href='<?php echo $mainurl; ?>';
@ -325,7 +327,7 @@ if ($submitAnswers || $buttonBack) {
$objQuestion->save($exerciseId);
$editQuestion = $questionId;
unset($modifyAnswers); //added
$mainurl = "admin.php";
$mainurl = $urlMainExercise."admin.php";
?>
<script>
window.location.href='<?php echo $mainurl; ?>';
@ -399,7 +401,7 @@ if ($submitAnswers || $buttonBack) {
else {
// adds the answer into the object
$objAnswer->createAnswer($match[$i], $sel[$i], '', $weighting[$i], $i);
$mainurl = "admin.php";
$mainurl = $urlMainExercise."admin.php";
?>
<script>
window.location.href='<?php echo $mainurl; ?>';

@ -22,7 +22,7 @@ $language_file = array('exercice', 'tracking');
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_QUIZ;
require_once '../gradebook/lib/be.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
// Setting the tabs
$this_section = SECTION_COURSES;
@ -627,7 +627,8 @@ if (!empty($exercise_list)) {
$class_tip = 'link_tooltip';
}
//$class_tip = 'exercise_link';
$url = $move.'<a '.$alt_title.' class="'.$class_tip.'" id="tooltip_'.$my_exercise_id.'" href="overview.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$my_exercise_id.'"><img src="../img/quiz.gif" /> '.$title.' </a>';
$urlOverview = 'overview.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$my_exercise_id;
$url = $move.'<a '.$alt_title.' class="'.$class_tip.'" id="tooltip_'.$my_exercise_id.'" href="'.$urlOverview.'">'.Display::return_icon('quiz.gif').' '.$title.' </a>';
$item = Display::tag('td', $url.' '.$session_img.$lp_blocked);

@ -5272,13 +5272,11 @@ class Exercise
*/
public function returnTimeLeftDiv()
{
$html = '<div id="clock_warning" style="display:none">'.Display::return_message(
get_lang('ReachedTimeLimit'),
'warning'
).' '.sprintf(
get_lang('YouWillBeRedirectedInXSeconds'),
$message = Display::return_message(
get_lang('ReachedTimeLimit'), 'warning' ).' '.sprintf(get_lang('YouWillBeRedirectedInXSeconds'),
'<span id="counter_to_redirect" class="red_alert"></span>'
).'</div>';
);
$html = '<div id="clock_warning" style="display:none">'.$message.'</div>';
$html .= '<div class="row"><div class="pull-right"><div id="exercise_clock_warning" class="well count_down"></div></div></div>';
return $html;

@ -105,12 +105,14 @@ if ($time_control) {
echo Display::div('', array('id' => 'message'));
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
echo '<script>
lp_data = $.param({"learnpath_id": '.$learnpath_id.', "learnpath_item_id" : '.$learnpath_item_id.', "learnpath_item_view_id": '.$learnpath_item_view_id.'});
function final_submit() {
//Normal inputs
window.location = "exercise_result.php?origin='.$origin.'&exe_id='.$exe_id.'&" + lp_data;
window.location = "'.$urlMainExercise.'exercise_result.php?origin='.$origin.'&exe_id='.$exe_id.'&" + lp_data;
}
function review_questions() {
@ -126,7 +128,7 @@ echo '<script>
$("#message").addClass("warning-message");
$("#message").html("'.addslashes(get_lang('SelectAQuestionToReview')).'");
}
window.location = "exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&reminder=2&origin='.$origin.'&" + lp_data;
window.location = "'.$urlMainExercise.'exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&reminder=2&origin='.$origin.'&" + lp_data;
}
function save_remind_item(obj, question_id) {
@ -187,7 +189,7 @@ foreach ($question_list as $questionId) {
}
$checkbox = Display::input('checkbox', 'remind_list['.$questionId.']', '', $attributes);
$url = 'exercise_submit.php?exerciseId='.$objExercise->id.'&num='.$counter.'&reminder=1';
$url = $urlMainExercise.'exercise_submit.php?exerciseId='.$objExercise->id.'&num='.$counter.'&reminder=1';
$counter++;
if ($objExercise->type == ONE_PER_PAGE) {

@ -17,7 +17,7 @@ $language_file = array('exercice');
// including the global library
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/be.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
// Setting the tabs
$this_section = SECTION_COURSES;
@ -27,6 +27,8 @@ $htmlHeadXtra[] = api_get_jqgrid_js();
// Access control
api_protect_course_script(true, false, true);
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
// including additional libraries
require_once 'exercise.class.php';
require_once 'question.class.php';
@ -223,7 +225,7 @@ if (isset($_REQUEST['comments']) && $_REQUEST['comments'] == 'update' && ($is_al
MessageManager::send_message_simple($student_id, $subject, $message, api_get_user_id());
}
//Updating LP score here
// Updating LP score here
if (in_array($origin, array('tracking_course', 'user_course', 'correct_exercise_in_lp'))) {
$sql_update_score = "UPDATE $TBL_LP_ITEM_VIEW SET score = '".floatval(
$tot
@ -231,12 +233,12 @@ if (isset($_REQUEST['comments']) && $_REQUEST['comments'] == 'update' && ($is_al
Database::query($sql_update_score);
if ($origin == 'tracking_course') {
//Redirect to the course detail in lp
header('location: exercice.php?course='.Security :: remove_XSS($_GET['course']));
header('Location: '.$urlMainExercise.'exercice.php?course='.Security :: remove_XSS($_GET['course']));
exit;
} else {
//Redirect to the reporting
// Redirect to the reporting
header(
'location: ../mySpace/myStudents.php?origin='.$origin.'&student='.$student_id.'&details=true&course='.$course_id.'&session_id='.$session_id
'Location: '.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?origin='.$origin.'&student='.$student_id.'&details=true&course='.$course_id.'&session_id='.$session_id
);
exit;
}

@ -169,7 +169,7 @@ if ($origin != 'learnpath') {
Display::display_footer();
} else {
$lp_mode = $_SESSION['lp_mode'];
$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
$url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"';
if (api_is_allowed_to_session_edit()) {

@ -730,7 +730,7 @@ if ($origin =='student_progress') { ?>
<?php
} else if($origin=='myprogress') {
?>
<button type="button" class="save" onclick="top.location.href='../auth/my_progress.php?course=<?php echo api_get_course_id()?>'" value="<?php echo get_lang('Finish'); ?>" >
<button type="button" class="save" onclick="top.location.href='<?php echo api_get_path(WEB_CODE_PATH); ?>auth/my_progress.php?course=<?php echo api_get_course_id()?>'" value="<?php echo get_lang('Finish'); ?>" >
<?php echo get_lang('Finish');?>
</button>
<?php
@ -742,7 +742,7 @@ if ($origin != 'learnpath') {
} else {
if (!isset($_GET['fb_type'])) {
$lp_mode = $_SESSION['lp_mode'];
$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
$url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
echo '<script type="text/javascript">'.$href.'</script>';

@ -529,6 +529,7 @@ if (!empty($exercise_stat_info['questions_to_check'])) {
}
if ($debug) { error_log("6.0 my_remind_list array: ".print_r($my_remind_list, 1)); }
$params = "exe_id=$exe_id&exerciseId=$exerciseId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id&".api_get_cidreq();
if ($debug) { error_log("6.1 params: $params"); };
if ($reminder == 2 && empty($my_remind_list)) {
@ -608,6 +609,8 @@ if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
$question_count = $objExercise->getCountCompressedQuestionList();
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
if ($formSent && isset($_POST)) {
if ($debug) { error_log('9. $formSent was sent'); }
@ -691,7 +694,7 @@ if ($formSent && isset($_POST)) {
}
}
}
header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
header("Location: ".$urlMainExercise."exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
exit;
} else {
//Time control is only enabled for ONE PER PAGE
@ -706,7 +709,7 @@ if ($formSent && isset($_POST)) {
}
}
if ($debug) { error_log('10. Redirecting to exercise_show.php'); }
header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
header("Location: ".$urlMainExercise."exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
exit;
}
} else {
@ -768,10 +771,10 @@ if ($question_count != 0) {
}
}
if ($objExercise->review_answers) {
header('Location: exercise_reminder.php?'.$params);
header('Location: '.$urlMainExercise.'exercise_reminder.php?'.$params);
exit;
} else {
header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
header("Location: ".$urlMainExercise."exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
exit;
}
}
@ -959,11 +962,12 @@ if ($reminder == 2) {
}
if ($objExercise->review_answers) {
$script_php = 'exercise_reminder.php';
$script_php = $urlMainExercise.'exercise_reminder.php';
} else {
$script_php = 'exercise_result.php';
$script_php = $urlMainExercise.'exercise_result.php';
}
if (!empty($error)) {
Display :: display_error_message($error, false);
} else {
@ -1019,12 +1023,12 @@ if (!empty($error)) {
});
function previous_question(question_num) {
url = "exercise_submit.php?'.$params.'&num="+question_num;
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num="+question_num;
window.location = url;
}
function previous_question_and_save(previous_question_id, question_id_to_save) {
url = "exercise_submit.php?'.$params.'&num="+previous_question_id;
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num="+previous_question_id;
//Save the current question
save_now(question_id_to_save, url);
}
@ -1037,9 +1041,9 @@ if (!empty($error)) {
if ('.$reminder.' == 1 ) {
url = "exercise_reminder.php?'.$params.'&num='.$current_question.'";
} else if ('.$reminder.' == 2 ) {
url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'&reminder=2";
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'&reminder=2";
} else {
url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
}
//$("#save_for_now_"+question_id).html("'.addslashes(Display::return_icon('save.png', get_lang('Saved'), array(), ICON_SIZE_SMALL)).'");
window.location = url;
@ -1079,7 +1083,7 @@ if (!empty($error)) {
$("#save_for_now_"+question_id).html("'.addslashes(Display::return_icon('loading1.gif')).'");
$.ajax({
type:"post",
type : "post",
async: false,
url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=save_exercise_by_now",
data: "'.$params.'&type=simple&question_id="+question_id+"&"+my_choice+"&"+hotspot+"&"+remind_list,
@ -1094,9 +1098,9 @@ if (!empty($error)) {
if ('.$reminder.' == 1 ) {
url = "exercise_reminder.php?'.$params.'&num='.$current_question.'";
} else if ('.$reminder.' == 2 ) {
url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'&reminder=2";
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'&reminder=2";
} else {
url = "exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
url = "'.$urlMainExercise.'exercise_submit.php?'.$params.'&num='.$current_question.'&remind_question_id='.$remind_question_id.'";
}
if (url_extra) {
@ -1187,7 +1191,7 @@ if (!empty($error)) {
$remind_list = explode(',', $exercise_stat_info['questions_to_check']);
}
echo '<form id="exercise_form" method="post" action="'.api_get_self().'?'.api_get_cidreq().'&autocomplete=off&gradebook='.$gradebook."&exerciseId=".$exerciseId .'" name="frm_exercise" '.$onsubmit.'>
echo '<form id="exercise_form" method="post" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_submit.php?'.api_get_cidreq().'&autocomplete=off&gradebook='.$gradebook."&exerciseId=".$exerciseId .'" name="frm_exercise" '.$onsubmit.'>
<input type="hidden" name="formSent" value="1" />
<input type="hidden" name="exerciseId" value="'.$exerciseId . '" />
<input type="hidden" name="num" value="'.$current_question.'" id="num_current_id" />
@ -1197,7 +1201,6 @@ if (!empty($error)) {
<input type="hidden" name="learnpath_item_id" value="'.$learnpath_item_id . '" />
<input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id . '" />';
$objExercise->renderQuestionList($questionList, $current_question, $exerciseResult, $attempt_list, $remind_list);
echo '</form>';
}

@ -28,6 +28,8 @@ if (empty ($exerciseResult)) {
$exerciseResult = $_SESSION['exerciseResult'];
}
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
if (empty($exerciseResultCoordinates)) {
$exerciseResultCoordinates = $_REQUEST['exerciseResultCoordinates'];
}
@ -108,7 +110,7 @@ if (empty($choice_value)) {
";
// IMPORTANT
//this is the real redirect function
echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";</script>';
echo 'window.location.href = "'.$urlMainExercise.'exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";</script>';
}
$choice = array();
@ -514,16 +516,14 @@ if ($destinationid==-1) {
$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
}
}
echo '<script>
function SendEx(num) {
if (num == -1) {
self.parent.window.location.href = "exercise_result.php?take_session=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
self.parent.window.location.href = "'.$urlMainExercise.'exercise_result.php?take_session=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
self.parent.tb_remove();
} else {
num -= 1;
self.parent.window.location.href = "exercise_submit.php?tryagain=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
self.parent.window.location.href = "'.$urlMainExercise.'exercise_submit.php?tryagain=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
self.parent.tb_remove();
}
}
@ -567,7 +567,7 @@ if ($links!='') {
} else {
$questionNum++;
echo '<script>
self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
self.parent.window.location.href = "'.$urlMainExercise.'exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
//self.parent.tb_remove();
</script>';
}

@ -14,7 +14,7 @@ $language_file = array('exercice');
// including the global library
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/be.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
// Setting the tabs
$this_section = SECTION_COURSES;

@ -66,7 +66,7 @@ if ($modifyIn) {
unset($buttonBack);
}
$hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercice/admin.php?' . api_get_cidreq() . '&exerciseId=' . $exerciseId;
$hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&exerciseId='.$exerciseId;
// the answer form has been submitted
if ($submitAnswers || $buttonBack) {

@ -15,11 +15,12 @@ use \ChamiloSession as Session;
$language_file = 'exercice';
require_once 'exercise.class.php';
require_once '../inc/global.inc.php';
$current_course_tool = TOOL_QUIZ;
// Clear the exercise session just in case
if (isset ($_SESSION['objExercise'])) {
Session::erase('objExercise');
if (isset($_SESSION['objExercise'])) {
Session::erase('objExercise');
}
$this_section = SECTION_COURSES;
@ -99,6 +100,7 @@ if (isset($exercise_stat_info['exe_id'])) {
//1. Check if this is a new attempt or a previous
$label = get_lang('StartTest');
if ($time_control && !empty($clock_expired_time) || !empty($attempt_list)) {
$label = get_lang('ContinueTest');
}

@ -13,6 +13,8 @@
$course_id = api_get_course_int_id();
$urlMainExercise = api_get_path(WEB_CODE_PATH).'exercice/';
// INIT QUESTION
if (isset($_GET['editQuestion'])) {
$objQuestion = Question::read($_GET['editQuestion'], null, $objExercise);
@ -130,13 +132,13 @@ if (is_object($objQuestion)) {
// redirect
if ($objQuestion->type != HOT_SPOT && $objQuestion->type != HOT_SPOT_DELINEATION) {
if (isset($_GET['editQuestion'])) {
echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemUpdated"</script>';
echo '<script type="text/javascript">window.location.href="'.$urlMainExercise.'admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemUpdated"</script>';
} else {
//New question
echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemAdded"</script>';
echo '<script type="text/javascript">window.location.href="'.$urlMainExercise.'admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemAdded"</script>';
}
} else {
echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'&'.api_get_cidreq().'"</script>';
echo '<script type="text/javascript">window.location.href="'.$urlMainExercise.'admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'&'.api_get_cidreq().'"</script>';
}
} else {
echo $message;

@ -28,7 +28,7 @@ FileManager::my_delete($full_file_path.$user_id.'.t.html');
$content = ReadFileCont($full_file_path.$user_id.'.t.html');
if ($content == '') {
$url = api_get_path(WEB_PATH)."main/exercice/savescores.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score";
$url = api_get_path(WEB_CODE_PATH)."exercice/savescores.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score";
$content = ReadFileCont($full_file_path);
$mit = "function Finish(){";
@ -107,4 +107,4 @@ $url = $document_web_path.$doc_url.$user_id.'.t.html?time='.Security::remove_XSS
echo '<iframe style="overflow:hidden" id="hotpotatoe" width="100%" frameborder="0" src="'.$url.'"></iframe>';
echo '</body></html>';
Display::display_footer();
exit;
exit;

@ -302,15 +302,14 @@ function lp_upload_quiz_action_handling()
$_SESSION['oLP']->add_item($parent, $previous, TOOL_QUIZ, $quiz_id, ($quiz_title), '');
// Redirect to home page for add more content
header(
'location: ../newscorm/lp_controller.php?'.api_get_cidreq(
'Location: '.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq(
).'&action=add_item&type=step&lp_id='.Security::remove_XSS(
$_GET['lp_id']
).'&session_id='.api_get_session_id()
);
exit;
} else {
// header('location: exercice.php?' . api_get_cidreq());
echo '<script>window.location.href = "admin.php?'.api_get_cidReq(
echo '<script>window.location.href = "'.api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidReq(
).'&exerciseId='.$quiz_id.'&session_id='.api_get_session_id().'"</script>';
}
}

@ -4,11 +4,13 @@
* Responses to AJAX calls
*/
require_once '../../exercice/exercise.class.php';
require_once '../../exercice/question.class.php';
require_once '../../exercice/answer.class.php';
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/question.class.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/answer.class.php';
use \ChamiloSession as Session;
api_protect_course_script(true);

@ -187,16 +187,22 @@ class ExerciseShowFunctions {
*/
static function display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect, $id, $questionId, $ans) {
global $feedback_type;
// radio_on.gif/radio_off.gif
$imageType = (in_array($answerType, array(UNIQUE_ANSWER,UNIQUE_ANSWER_IMAGE, UNIQUE_ANSWER_NO_OPTION))) ? 'radio' : 'checkbox';
$image = $imageType.($studentChoice ? '_on' : '_off');
$image .= '.gif';
$imageAnswer = $imageType.($answerCorrect ? '_on' : '_off');
$imageAnswer .= '.gif';
?>
<tr>
<td width="5%">
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER,UNIQUE_ANSWER_IMAGE, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $studentChoice?'_on':'_off'; ?>.gif"
border="0" alt="" />
<?php Display::display_icon($image); ?>
</td>
<td width="5%">
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_IMAGE, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $answerCorrect?'_on':'_off'; ?>.gif"
border="0" alt=" " />
<?php Display::display_icon($imageAnswer); ?>
</td>
<td width="40%">
<?php
@ -240,16 +246,23 @@ class ExerciseShowFunctions {
static function display_unique_image_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect, $id, $questionId, $ans) {
global $feedback_type;
$imageType = (in_array($answerType, array(UNIQUE_ANSWER,UNIQUE_ANSWER_IMAGE, UNIQUE_ANSWER_NO_OPTION))) ? 'radio' : 'checkbox';
$image = $imageType.($studentChoice ? '_on' : '_off');
$image .= '.gif';
$imageAnswer = $imageType.($answerCorrect ? '_on' : '_off');
$imageAnswer .= '.gif';
?>
<tr>
<td width="5%">
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $studentChoice?'_on':'_off'; ?>.gif"
border="0" alt="" />
</td>
<td width="5%">
<img src="../img/<?php echo (in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION))) ? 'radio':'checkbox'; echo $answerCorrect?'_on':'_off'; ?>.gif"
border="0" alt=" " />
</td>
<tr>
<td width="5%">
<?php Display::display_icon($image); ?>
</td>
<td width="5%">
<?php Display::display_icon($imageAnswer); ?>
</td>
<td width="40%">
<?php
echo $answer;
@ -438,4 +451,4 @@ class ExerciseShowFunctions {
</tr>
<?php
}
}
}

Loading…
Cancel
Save