chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Format code

Browse Source 
Refs #2184
pull/2837/head
Angel Fernando Quiroz Campos 7 years ago
parent a3fdf2be37
commit 8eb33d9e86
2 changed files with 42 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 50
      main/gradebook/exercise_jump.php
  2. 12
      main/gradebook/lib/be/exerciselink.class.php

50
main/gradebook/exercise_jump.php
Unescape View File

@ -26,13 +26,15 @@ $doExerciseUrl = '';
if ($type == LINK_HOTPOTATOES) { if ($type == LINK_HOTPOTATOES) {
$exerciseId = $_GET['exerciseId']; $exerciseId = $_GET['exerciseId'];
$path = Security::remove_XSS($_GET['path']); $path = Security::remove_XSS($_GET['path']);
$doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/showinframes.php?'.http_build_query([ $doExerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/showinframes.php?'.http_build_query(
'session_id' => $session_id, [
'cidReq' => Security::remove_XSS($cidReq), 'session_id' => $session_id,
'file' => $path, 'cidReq' => Security::remove_XSS($cidReq),
'cid' => api_get_course_id(), 'file' => $path,
'uid' => api_get_user_id(), 'cid' => api_get_course_id(),
]); 'uid' => api_get_user_id(),
]
);
header('Location: '.$doExerciseUrl); header('Location: '.$doExerciseUrl);
exit; exit;
} }
@ -41,9 +43,10 @@ if (!empty($doExerciseUrl)) {
header('Location: '.$doExerciseUrl); header('Location: '.$doExerciseUrl);
exit; exit;
} else { } else {
$url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?session_id='.$session_id.'&cidReq='.Security::remove_XSS($cidReq); $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'
.http_build_query(['session_id' => $session_id, 'cidReq' => $cidReq]);
if (isset($_GET['gradebook'])) { if (isset($_GET['gradebook'])) {
$url .= '&gradebook=view&exerciseId='.intval($_GET['exerciseId']); $url .= '&gradebook=view&exerciseId='.((int) $_GET['exerciseId']);
// Check if exercise is inserted inside a LP, if that's the case // Check if exercise is inserted inside a LP, if that's the case
$exerciseId = $_GET['exerciseId']; $exerciseId = $_GET['exerciseId'];
@ -57,7 +60,14 @@ if (!empty($doExerciseUrl)) {
// If the exercise was added once redirect to the LP // If the exercise was added once redirect to the LP
$firstLp = current($exercise->lpList); $firstLp = current($exercise->lpList);
if (isset($firstLp['lp_id'])) { if (isset($firstLp['lp_id'])) {
$url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&lp_id='.$firstLp['lp_id'].'&action=view&isStudentView=true'; $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&'
.http_build_query(
[
'lp_id' => $firstLp['lp_id'],
'action' => 'view',
'isStudentView' => 'true',
]
);
} }
} else { } else {
// If the exercise was added multiple times show the LP list // If the exercise was added multiple times show the LP list
@ -65,15 +75,17 @@ if (!empty($doExerciseUrl)) {
} }
} }
} else { } else {
$url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query([ $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query(
'session_id' => $session_id, [
'cidReq' => $cidReq, 'session_id' => $session_id,
'gradebook' => $gradebook, 'cidReq' => $cidReq,
'origin' => '', 'gradebook' => $gradebook,
'learnpath_id' => '', 'origin' => '',
'learnpath_item_id' => '', 'learnpath_id' => '',
'exerciseId' => (int) $_GET['exerciseId'], 'learnpath_item_id' => '',
]); 'exerciseId' => (int) $_GET['exerciseId'],
]
);
} }
} }
} }

12
main/gradebook/lib/be/exerciselink.class.php
Unescape View File

@ -387,7 +387,17 @@ class ExerciseLink extends AbstractLink
$exerciseId = $data['id']; $exerciseId = $data['id'];
$path = isset($data['path']) ? $data['path'] : ''; $path = isset($data['path']) ? $data['path'] : '';
$url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?path='.$path.'&session_id='.$sessionId.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$exerciseId.'&type='.$this->get_type(); $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?'
.http_build_query(
[
'path' => $path,
'session_id' => $sessionId,
'cidReq' => $this->get_course_code(),
'gradebook' => 'view',
'exerciseId' => $exerciseId,
'type' => $this->get_type(),
]
);
return $url; return $url;
} }

Write Preview
Loading…
Cancel
Save