From 32146f580d6c7ec2a933ce27b6ee91b01aae9449 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 20 Aug 2013 14:58:20 +0200 Subject: [PATCH] Minor - format code --- main/admin/session_list.php | 2 ++ main/exercice/exercise_result.php | 19 +++++++------- main/exercice/exercise_show.php | 12 ++++----- main/exercice/exercise_submit.php | 12 ++++----- main/inc/ajax/exercise.ajax.php | 43 +++++++++++++++++-------------- 5 files changed, 47 insertions(+), 41 deletions(-) diff --git a/main/admin/session_list.php b/main/admin/session_list.php index 55a4093edc..95e4bb9dfc 100644 --- a/main/admin/session_list.php +++ b/main/admin/session_list.php @@ -163,3 +163,5 @@ echo '' echo ''; echo Display::grid_html('sessions'); Display::display_footer(); + + diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php index ac7d130349..985a0ea8b4 100644 --- a/main/exercice/exercise_result.php +++ b/main/exercice/exercise_result.php @@ -30,12 +30,12 @@ require_once '../inc/global.inc.php'; require_once 'exercise.lib.php'; if ($_GET['origin']=='learnpath') { - require_once '../newscorm/learnpath.class.php'; - require_once '../newscorm/learnpathItem.class.php'; - require_once '../newscorm/scorm.class.php'; - require_once '../newscorm/scormItem.class.php'; - require_once '../newscorm/aicc.class.php'; - require_once '../newscorm/aiccItem.class.php'; + require_once '../newscorm/learnpath.class.php'; + require_once '../newscorm/learnpathItem.class.php'; + require_once '../newscorm/scorm.class.php'; + require_once '../newscorm/scormItem.class.php'; + require_once '../newscorm/aicc.class.php'; + require_once '../newscorm/aiccItem.class.php'; } require_once api_get_path(LIBRARY_PATH).'exercise_show_functions.lib.php'; require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php'; @@ -133,10 +133,11 @@ if ($objExercise->selectAttempts() > 0) { Display :: display_normal_message(get_lang('Saved').'
',false); -//Display questions +// Display questions display_question_list_by_attempt($objExercise, $exe_id, true); //If is not valid + $session_control_key = get_session_time_control_key($objExercise->id, $learnpath_id, $learnpath_item_id); if (isset($session_control_key) && !exercise_time_control_is_valid($objExercise->id, $learnpath_id, $learnpath_item_id)) { $TBL_TRACK_ATTEMPT = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); @@ -163,7 +164,7 @@ if ($origin != 'learnpath') { $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; $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"'; - + if (api_is_allowed_to_session_edit()) { Session::erase('objExercise'); Session::erase('exe_id'); @@ -172,4 +173,4 @@ if ($origin != 'learnpath') { echo ""; echo ''; echo ''; -} \ No newline at end of file +} diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php index ad59d63a0b..efb530b9e2 100644 --- a/main/exercice/exercise_show.php +++ b/main/exercice/exercise_show.php @@ -61,7 +61,7 @@ if ( empty ( $action ) ) { $action = $_REQUEST['action']; } $id = intval($_REQUEST['id']); //exe id if (empty($id)) { - api_not_allowed(true); + api_not_allowed(true); } if (api_is_course_session_coach(api_get_user_id(), api_get_course_id(), api_get_session_id())) { @@ -70,7 +70,7 @@ if (api_is_course_session_coach(api_get_user_id(), api_get_course_id(), api_get_ } } -$is_allowedToEdit = api_is_allowed_to_edit(null,true) || $is_courseTutor || api_is_session_admin() || api_is_drh(); +$is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor || api_is_session_admin() || api_is_drh(); //Getting results from the exe_id. This variable also contain all the information about the exercise $track_exercise_info = get_exercise_track_exercise_info($id); @@ -428,12 +428,12 @@ foreach ($questionList as $questionId) { '; if ($answerType!= HOT_SPOT_DELINEATION) { - $item_list=explode('@@',$destination); - //print_R($item_list); + $item_list = explode('@@',$destination); + $try = $item_list[0]; $lp = $item_list[1]; - $destinationid= $item_list[2]; - $url=$item_list[3]; + $destinationid = $item_list[2]; + $url = $item_list[3]; $table_resume=''; } else { if ($next==0) { diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php index efd58f06c3..2c081ba4e1 100644 --- a/main/exercice/exercise_submit.php +++ b/main/exercice/exercise_submit.php @@ -215,7 +215,6 @@ if ($objExercise->selectAttempts() > 0) { if ($debug) { error_log("4. Setting the exe_id: $exe_id");} ; //5. Getting user exercise info (if the user took the exam before) - generating exe_id -//var_dump($learnpath_id.' - '.$learnpath_item_id.' - '.$learnpath_item_view_id); $exercise_stat_info = $objExercise->get_stat_track_exercise_info($learnpath_id, $learnpath_item_id, $learnpath_item_view_id); $clock_expired_time = null; @@ -875,16 +874,16 @@ if (!empty($error)) { } function save_now_all(validate) { - //1. Input choice + // 1. Input choice. var my_choice = $(\'*[name*="choice"]\').serialize(); - //2. Reminder + // 2. Reminder. var remind_list = $(\'*[name*="remind_list"]\').serialize(); - //3. Hotspots + // 3. Hotspots. var hotspot = $(\'*[name*="hotspot"]\').serialize(); - //Question list + // Question list. var question_list = ['.implode(',', $questionList).']; var free_answers = {}; @@ -901,7 +900,8 @@ if (!empty($error)) { } } }); - //lok+(fgt)= data base + + // lok+(fgt)= data base free_answers = $.param(free_answers); $("#save_all_reponse").html("'.addslashes(Display::return_icon('loading1.gif')).'"); diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index 43c65fc53b..1b73ce1e88 100644 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -39,7 +39,9 @@ switch ($action) { } // get index row - i.e. user click to sort $sord = $_GET['sord']; // get the direction - if (!$sidx) $sidx = 1; + if (!$sidx) { + $sidx = 1; + } $track_exercise = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); $user_table = Database::get_main_table(TABLE_MAIN_USER); @@ -178,19 +180,19 @@ switch ($action) { } break; case 'add_question_to_reminder': - $objExercise = $_SESSION['objExercise']; - if (empty($objExercise)) { - echo 0; - exit; - } else { - $objExercise->edit_question_to_remind($_REQUEST['exe_id'], $_REQUEST['question_id'], $_REQUEST['action']); - } - break; + $objExercise = $_SESSION['objExercise']; + if (empty($objExercise)) { + echo 0; + exit; + } else { + $objExercise->edit_question_to_remind($_REQUEST['exe_id'], $_REQUEST['question_id'], $_REQUEST['action']); + } + break; case 'save_exercise_by_now': $course_info = api_get_course_info($course_code); $course_id = $course_info['real_id']; - //Use have permissions? + // Use have permissions? if (api_is_allowed_to_session_edit()) { //"all" or "simple" strings means that there's one or all questions exercise type @@ -212,20 +214,22 @@ switch ($action) { //Attempt id $exe_id = $_REQUEST['exe_id']; - if ($debug) error_log("exe_id = $exe_id "); - if ($debug) error_log("type = $type "); - if ($debug) error_log("choice = ".print_r($choice, 1)." "); - if ($debug) error_log("hot_spot_coordinates = ".print_r($hot_spot_coordinates,1)); - if ($debug) error_log("remind_list = ".print_r($remind_list, 1)); + if ($debug) { + error_log("exe_id = $exe_id "); + error_log("type = $type "); + error_log("choice = ".print_r($choice, 1)." "); + error_log("hot_spot_coordinates = ".print_r($hot_spot_coordinates, 1)); + error_log("remind_list = ".print_r($remind_list, 1)); + } - //Exercise information + // Exercise information. $objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null; - //Question info + // Question info. $question_id = intval($_REQUEST['question_id']); $question_list = $_SESSION['questionList']; - //If exercise or question is not set then exit + // If exercise or question is not set then exit. if (empty($question_list) || empty($objExercise)) { echo 'error'; exit; @@ -274,7 +278,6 @@ switch ($action) { } } - //No exe id? Can't save answer. if (empty($exe_id)) { //Fires an error @@ -296,7 +299,7 @@ switch ($action) { unset($objQuestionTmp); - //Looping the question list + // Looping the question list foreach ($question_list as $my_question_id) { if ($debug) error_log("Saving question_id = $my_question_id ");