mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-41665 mod_scorm: fixed broken report URLs

Browse Source
This commit is contained in:
Mark Nelson 2014-06-03 23:56:43 -07:00
parent 0591c2056d
commit e2cd4f5b95
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod/scorm/report/basic/report.php
View File

@ -391,8 +391,8 @@ class scorm_basic_report extends scorm_default_report {
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
}
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/user/view.php?id='.$scouser->userid.'&course='.$course->id,
fullname($scouser));
$url = new moodle_url('/user/view.php', array('id' => $scouser->userid, 'course' => $course->id));
$row[] = html_writer::link($url, fullname($scouser));
} else {
$row[] = fullname($scouser);
}
@ -406,8 +406,9 @@ class scorm_basic_report extends scorm_default_report {
$row[] = '-';
} else {
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreport.php?id='.$cm->id.'&user='.
$scouser->userid.'&attempt='.$scouser->attempt, $scouser->attempt);
$url = new moodle_url('/mod/scorm/report/userreport.php', array('id' => $cm->id, 'user' => $scouser->userid,
'attempt' => $scouser->attempt));
$row[] = html_writer::link($url, $scouser->attempt);
} else {
$row[] = $scouser->attempt;
}
@ -449,12 +450,11 @@ class scorm_basic_report extends scorm_default_report {
$score = $strstatus;
}
if (!$download) {
$url = new moodle_url('/mod/scorm/report/userreporttracks.php', array('id' => $cm->id,
'scoid' => $sco->id, 'user' => $scouser->userid, 'attempt' => $scouser->attempt));
$row[] = html_writer::img($OUTPUT->pix_url($trackdata->status, 'scorm'), $strstatus,
array('title' => $strstatus)).html_writer::empty_tag('br').
html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreporttracks.php?id='.
$cm->id.'&scoid='.$sco->id.'&user='.$scouser->userid.
'&attempt='.$scouser->attempt, $score,
array('title' => get_string('details', 'scorm')));
array('title' => $strstatus)) . html_writer::empty_tag('br') .
html_writer::link($url, $score, array('title' => get_string('details', 'scorm')));
} else {
$row[] = $score;
}

18
mod/scorm/report/interactions/report.php
View File

@ -426,8 +426,8 @@ class scorm_interactions_report extends scorm_default_report {
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
}
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/user/view.php?id='.$scouser->userid.'&course='.$course->id,
fullname($scouser));
$url = new moodle_url('/user/view.php', array('id' => $scouser->userid, 'course' => $course->id));
$row[] = html_writer::link($url, fullname($scouser));
} else {
$row[] = fullname($scouser);
}
@ -441,8 +441,9 @@ class scorm_interactions_report extends scorm_default_report {
$row[] = '-';
} else {
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreport.php?id='.$cm->id.'&user='.
$scouser->userid.'&attempt='.$scouser->attempt, $scouser->attempt);
$url = new moodle_url('/mod/scorm/report/userreport.php', array('id' => $cm->id, 'user' => $scouser->userid,
'attempt' => $scouser->attempt));
$row[] = html_writer::link($url, $scouser->attempt);
} else {
$row[] = $scouser->attempt;
}
@ -477,12 +478,11 @@ class scorm_interactions_report extends scorm_default_report {
$score = $strstatus;
}
if (!$download) {
$url = new moodle_url('/mod/scorm/report/userreporttracks.php', array('id' => $cm->id,
'scoid' => $sco->id, 'user' => $scouser->userid, 'attempt' => $scouser->attempt));
$row[] = html_writer::img($OUTPUT->pix_url($trackdata->status, 'scorm'), $strstatus,
array('title' => $strstatus)).html_writer::empty_tag('br').
html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreporttracks.php?id='.
$cm->id.'&scoid='.$sco->id.'&user='.$scouser->userid.
'&attempt='.$scouser->attempt, $score,
array('title' => get_string('details', 'scorm')));
array('title' => $strstatus)) . html_writer::empty_tag('br') .
html_writer::link($url, $score, array('title' => get_string('details', 'scorm')));
} else {
$row[] = $score;
}

18
mod/scorm/report/objectives/report.php
View File

@ -427,8 +427,8 @@ class scorm_objectives_report extends scorm_default_report {
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
}
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/user/view.php?id='.$scouser->userid.'&course='.$course->id,
fullname($scouser));
$url = new moodle_url('/user/view.php', array('id' => $scouser->userid, 'course' => $course->id));
$row[] = html_writer::link($url, fullname($scouser));
} else {
$row[] = fullname($scouser);
}
@ -442,8 +442,9 @@ class scorm_objectives_report extends scorm_default_report {
$row[] = '-';
} else {
if (!$download) {
$row[] = html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreport.php?id='.$cm->id.'&user='.
$scouser->userid.'&attempt='.$scouser->attempt, $scouser->attempt);
$url = new moodle_url('/mod/scorm/report/userreport.php', array('id' => $cm->id, 'user' => $scouser->userid,
'attempt' => $scouser->attempt));
$row[] = html_writer::link($url, $scouser->attempt);
} else {
$row[] = $scouser->attempt;
}
@ -479,12 +480,11 @@ class scorm_objectives_report extends scorm_default_report {
$score = $strstatus;
}
if (!$download) {
$url = new moodle_url('/mod/scorm/report/userreporttracks.php', array('id' => $cm->id,
'scoid' => $sco->id, 'user' => $scouser->userid, 'attempt' => $scouser->attempt));
$row[] = html_writer::img($OUTPUT->pix_url($trackdata->status, 'scorm'), $strstatus,
array('title' => $strstatus)).html_writer::empty_tag('br').
html_writer::link($CFG->wwwroot.'/mod/scorm/report/userreporttracks.php?id='.
$cm->id.'&scoid='.$sco->id.'&user='.$scouser->userid.
'&attempt='.$scouser->attempt, $score,
array('title' => get_string('details', 'scorm')));
array('title' => $strstatus)) . html_writer::empty_tag('br') .
html_writer::link($url, $score, array('title' => get_string('details', 'scorm')));
} else {
$row[] = $score;
}