Merge branch 'master_MDL-31461' of git://github.com/danmarsden/moodle

This commit is contained in:
Aparup Banerjee 2012-02-08 10:12:20 +08:00
commit 50ea492bc5
2 changed files with 10 additions and 4 deletions

View File

@ -121,6 +121,7 @@ function plagiarism_get_form_elements_module($mform, $context) {
*
* @param object $course - full Course object
* @param object $cm - full cm object
* @return string
*/
function plagiarism_update_status($course, $cm) {
global $CFG;
@ -128,17 +129,20 @@ function plagiarism_update_status($course, $cm) {
return '';
}
$plagiarismplugins = plagiarism_load_available_plugins();
$output = '';
foreach($plagiarismplugins as $plugin => $dir) {
require_once($dir.'/lib.php');
$plagiarismclass = "plagiarism_plugin_$plugin";
$plagiarismplugin = new $plagiarismclass;
$plagiarismplugin->update_status($course, $cm);
$output .= $plagiarismplugin->update_status($course, $cm);
}
return $output;
}
/**
* Function that prints the student disclosure notifying that the files will be checked for plagiarism
* @param integer $cmid - the cmid of this module
* @return string
*/
function plagiarism_print_disclosure($cmid) {
global $CFG;
@ -146,12 +150,14 @@ function plagiarism_print_disclosure($cmid) {
return '';
}
$plagiarismplugins = plagiarism_load_available_plugins();
$output = '';
foreach($plagiarismplugins as $plugin => $dir) {
require_once($dir.'/lib.php');
$plagiarismclass = "plagiarism_plugin_$plugin";
$plagiarismplugin = new $plagiarismclass;
$plagiarismplugin->print_disclosure($cmid);
$output .= $plagiarismplugin->print_disclosure($cmid);
}
return $output;
}
/**
* used by admin/cron.php to get similarity scores from submitted files.

View File

@ -211,7 +211,7 @@ class assignment_base {
echo $OUTPUT->box_start('generalbox boxaligncenter', 'intro');
echo format_module_intro('assignment', $this->assignment, $this->cm->id);
echo $OUTPUT->box_end();
plagiarism_print_disclosure($this->cm->id);
echo plagiarism_print_disclosure($this->cm->id);
}
/**
@ -1221,7 +1221,7 @@ class assignment_base {
echo '<div class="usersubmissions">';
//hook to allow plagiarism plugins to update status/print links.
plagiarism_update_status($this->course, $this->cm);
echo plagiarism_update_status($this->course, $this->cm);
$course_context = get_context_instance(CONTEXT_COURSE, $course->id);
if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)) {