From 4f2721953d57f1ffbcc07eae3f6fa9b0d7aa9229 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 20 Jun 2013 14:54:50 +0200 Subject: [PATCH] Using absolut URL paths --- main/document/document_slideshow.inc.php | 4 +- main/exercice/admin.php | 26 +++++++------ main/exercice/adminhp.php | 8 ++-- main/exercice/answer_admin.inc.php | 10 +++-- main/exercice/exercice.php | 5 ++- main/exercice/exercise.class.php | 10 ++--- main/exercice/exercise_reminder.php | 8 ++-- main/exercice/exercise_report.php | 12 +++--- main/exercice/exercise_result.php | 2 +- main/exercice/exercise_show.php | 4 +- main/exercice/exercise_submit.php | 33 +++++++++------- main/exercice/exercise_submit_modal.php | 12 +++--- main/exercice/hotpotatoes_exercise_report.php | 2 +- main/exercice/hotspot_admin.inc.php | 2 +- main/exercice/overview.php | 6 ++- main/exercice/question_admin.inc.php | 8 ++-- main/exercice/showinframes.php | 4 +- main/exercice/upload_exercise.php | 5 +-- main/inc/ajax/exercise.ajax.php | 8 ++-- main/inc/lib/exercise_show_functions.lib.php | 39 ++++++++++++------- 20 files changed, 119 insertions(+), 89 deletions(-) diff --git a/main/document/document_slideshow.inc.php b/main/document/document_slideshow.inc.php index c766e13e44..ca905b0e06 100644 --- a/main/document/document_slideshow.inc.php +++ b/main/document/document_slideshow.inc.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) { diff --git a/main/exercice/admin.php b/main/exercice/admin.php index a14324ee19..720a77302d 100644 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -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 '
'; if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion']) || isset($_GET['myid'])) { - echo ''.Display::return_icon( + echo ''.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 ''.Display::return_icon( + echo ''.Display::return_icon( 'back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM ).''; } - echo ''.Display::return_icon( + echo ''.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 ).''; } else { - echo ''.Display::return_icon( + echo ''.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 '
'; - echo '.'.Display::return_icon( + echo '.'.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 '
'; - echo ''.Display::return_icon( + echo ''.Display::return_icon( 'back.png', get_lang('GoBackToQuestionList'), '', diff --git a/main/exercice/adminhp.php b/main/exercice/adminhp.php index 14204ba43a..0d82800327 100644 --- a/main/exercice/adminhp.php +++ b/main/exercice/adminhp.php @@ -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/'; ?>

@@ -75,15 +76,14 @@ if (isset($newName)) { if ($newName!="") { //alter database record for that test SetComment($hotpotatoesName,$newName); - echo ""; + echo ""; } } -echo "
"; +echo ""; echo ""; echo "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"; ?> '; diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php index e3e44f3f6f..e38ae6d289 100644 --- a/main/exercice/exercise_submit.php +++ b/main/exercice/exercise_submit.php @@ -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 ' + echo ' @@ -1197,7 +1201,6 @@ if (!empty($error)) { '; $objExercise->renderQuestionList($questionList, $current_question, $exerciseResult, $attempt_list, $remind_list); - echo '
'; } diff --git a/main/exercice/exercise_submit_modal.php b/main/exercice/exercise_submit_modal.php index 8b34c21680..cc2536e90b 100644 --- a/main/exercice/exercise_submit_modal.php +++ b/main/exercice/exercise_submit_modal.php @@ -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.'";'; + 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.'";'; } $choice = array(); @@ -514,16 +516,14 @@ if ($destinationid==-1) { $links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).''.get_lang('GoToQuestion').' '.$num_value_array[0].'

'; } } - echo ''; } diff --git a/main/exercice/hotpotatoes_exercise_report.php b/main/exercice/hotpotatoes_exercise_report.php index acb41e616b..2bd4a77d1e 100644 --- a/main/exercice/hotpotatoes_exercise_report.php +++ b/main/exercice/hotpotatoes_exercise_report.php @@ -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; diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php index f1dd184320..df23bf567c 100644 --- a/main/exercice/hotspot_admin.inc.php +++ b/main/exercice/hotspot_admin.inc.php @@ -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) { diff --git a/main/exercice/overview.php b/main/exercice/overview.php index 15adb8d92f..e3844b7b05 100644 --- a/main/exercice/overview.php +++ b/main/exercice/overview.php @@ -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'); } diff --git a/main/exercice/question_admin.inc.php b/main/exercice/question_admin.inc.php index e3e1bbfacf..709ebc965f 100644 --- a/main/exercice/question_admin.inc.php +++ b/main/exercice/question_admin.inc.php @@ -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 ''; + echo ''; } else { //New question - echo ''; + echo ''; } } else { - echo ''; + echo ''; } } else { echo $message; diff --git a/main/exercice/showinframes.php b/main/exercice/showinframes.php index 9fe18b3c11..5b110e4ca3 100644 --- a/main/exercice/showinframes.php +++ b/main/exercice/showinframes.php @@ -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 ''; echo ''; Display::display_footer(); -exit; \ No newline at end of file +exit; diff --git a/main/exercice/upload_exercise.php b/main/exercice/upload_exercise.php index cebca0ea61..11aa038ec9 100644 --- a/main/exercice/upload_exercise.php +++ b/main/exercice/upload_exercise.php @@ -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 ''; } } diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index 5bcd2641de..1a7af20bd5 100644 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -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); diff --git a/main/inc/lib/exercise_show_functions.lib.php b/main/inc/lib/exercise_show_functions.lib.php index 0221d171d2..b54d6b55c7 100644 --- a/main/inc/lib/exercise_show_functions.lib.php +++ b/main/inc/lib/exercise_show_functions.lib.php @@ -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'; ?> - + - + - - - - - - + + + + + + +