new option 'clamav'

[pmg-api.git] / PMG / Utils.pm

diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index 6689d10fd44b8101bc448ade64c0111ebd8762ce..46fb89e86c0203c59f230227f56b5b5c153f1d84 100644 (file)
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -408,8 +408,15 @@ sub analyze_virus {
        }
     }
 
-    # always scan with clamav
-    return analyze_virus_clam($queue, $filename, $pmg_cfg);
+    my $enable_clamav = $pmg_cfg->get('admin', 'clamav');
+
+    if ($enable_clamav) {
+       if (my $vinfo = analyze_virus_clam($queue, $filename, $pmg_cfg)) {
+           return $vinfo;
+       }
+    }
+
+    return undef;
 }
 
 sub magic_mime_type_for_file {