moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged function rename from stable MDL-7594

Browse source
This commit is contained in:
moodler 2006-11-17 04:02:47 +00:00
parent ac433e390b
commit 34941e0727
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/uploadlib.php
View file

@ -112,7 +112,7 @@ class upload_manager {
continue; continue;
} }
if ($this->status && !empty($CFG->runclamonupload)) { if ($this->status && !empty($CFG->runclamonupload)) {
$this->status = clam_scan_file($this->files[$name],$this->course); $this->status = clam_scan_moodle_file($this->files[$name],$this->course);
} }
if (!$this->status) { if (!$this->status) {
if (!$this->config->recoverifmultiple && count($this->files) > 1) { if (!$this->config->recoverifmultiple && count($this->files) > 1) {
@ -586,7 +586,7 @@ function clam_replace_infected_file($file) {
* @param course $course {@link $COURSE} * @param course $course {@link $COURSE}
* @return int 1 if good, 0 if something goes wrong (opposite from actual error code from clam) * @return int 1 if good, 0 if something goes wrong (opposite from actual error code from clam)
*/ */
function clam_scan_file(&$file, $course) { function clam_scan_moodle_file(&$file, $course) {
global $CFG, $USER; global $CFG, $USER;
if (is_array($file) && is_uploaded_file($file['tmp_name'])) { // it's from $_FILES if (is_array($file) && is_uploaded_file($file['tmp_name'])) { // it's from $_FILES