mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
MDL-66136 assign: Verify presence of resources in online text submission
This commit is contained in:
parent
911d164dcb
commit
b7e4229187
@ -599,12 +599,17 @@ class assign_submission_onlinetext extends assign_submission_plugin {
|
||||
public function is_empty(stdClass $submission) {
|
||||
$onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
|
||||
$wordcount = 0;
|
||||
$hasinsertedresources = false;
|
||||
|
||||
if (isset($onlinetextsubmission->onlinetext)) {
|
||||
$wordcount = count_words(trim($onlinetextsubmission->onlinetext));
|
||||
// Check if the online text submission contains video, audio or image elements
|
||||
// that can be ignored and stripped by count_words().
|
||||
$hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
|
||||
trim($onlinetextsubmission->onlinetext));
|
||||
}
|
||||
|
||||
return $wordcount == 0;
|
||||
return $wordcount == 0 && !$hasinsertedresources;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -621,12 +626,17 @@ class assign_submission_onlinetext extends assign_submission_plugin {
|
||||
return true;
|
||||
}
|
||||
$wordcount = 0;
|
||||
$hasinsertedresources = false;
|
||||
|
||||
if (isset($data->onlinetext_editor['text'])) {
|
||||
$wordcount = count_words(trim((string)$data->onlinetext_editor['text']));
|
||||
// Check if the online text submission contains video, audio or image elements
|
||||
// that can be ignored and stripped by count_words().
|
||||
$hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
|
||||
trim((string)$data->onlinetext_editor['text']));
|
||||
}
|
||||
|
||||
return $wordcount == 0;
|
||||
return $wordcount == 0 && !$hasinsertedresources;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user