From 408c90cb62b8738db5ed45f3f41db60e3740cfe3 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 6 Sep 2023 16:55:20 -0500 Subject: [PATCH] Exercise: Refactor exercise url params - refs BT#20901 --- main/exercise/overview.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/main/exercise/overview.php b/main/exercise/overview.php index 37f845872f..d81af58621 100755 --- a/main/exercise/overview.php +++ b/main/exercise/overview.php @@ -44,8 +44,8 @@ $origin = api_get_origin(); $logInfo = [ 'tool' => TOOL_QUIZ, 'tool_id' => $exercise_id, - 'action' => isset($_REQUEST['learnpath_id']) ? 'learnpath_id' : '', - 'action_details' => isset($_REQUEST['learnpath_id']) ? (int) $_REQUEST['learnpath_id'] : '', + 'action' => $learnpath_id ? 'learnpath_id' : '', + 'action_details' => $learnpath_id ?: '', ]; Event::registerLog($logInfo); @@ -62,16 +62,22 @@ if ($objExercise->expired_time != 0 && !empty($clock_expired_time)) { $time_control = true; } -$extra_params = ''; +$exerciseUrlParams = [ + 'exerciseId' => $objExercise->iid, + 'learnpath_id' => $learnpath_id, + 'learnpath_item_id' => $learnpath_item_id, + 'learnpath_item_view_id' => $learnpathItemViewId +]; if (isset($_GET['preview'])) { - $extra_params = '&preview=1'; + $exerciseUrlParams['preview'] = 1; } // It is a lti provider if (isset($_GET['lti_launch_id'])) { - $extra_params .= '<i_launch_id='.Security::remove_XSS($_GET['lti_launch_id']); + $exerciseUrlParams['lti_launch_id'] = Security::remove_XSS($_GET['lti_launch_id']); } + $exercise_url = api_get_path(WEB_CODE_PATH).'exercise/exercise_submit.php?'. - api_get_cidreq().'&exerciseId='.$objExercise->iid.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_item_view_id='.$learnpathItemViewId.$extra_params; + api_get_cidreq().'&'.http_build_query($exerciseUrlParams); if ($time_control) { // Get time left for expiring time