--- viralator-09pre2.cgi	2001-12-06 01:22:37.000000000 -0500
+++ viralator.new.cgi	2003-04-30 10:06:06.000000000 -0400
@@ -164,8 +164,8 @@
 # A little housekeeping first
 
 $default_lang = "en";     #Possible values "it", "en" or write your own lang!
-$antivirus="INOCULATE";      #Possible values: INOCULATE, AVP, RAV, ANTIVIR,
-                          # MCAFEE, SOPHOS, TREND
+$antivirus="COMMAND";      #Possible values: INOCULATE, AVP, RAV, ANTIVIR,
+                          # MCAFEE, SOPHOS, TREND, COMMAND
 
 #Some virus notes:
 #
@@ -185,7 +185,7 @@
 $virusscanner{"MCAFEE"}= "uvscan";      
 $virusscanner{"SOPHOS"} = "sweep";   	  
 $virusscanner{"TREND"} = "vscan";   	  
-
+$virusscanner{"COMMAND"} = "csav";
 
 # Added this to make life easier when untainting code
 # The path info to get to the antivirus executable
@@ -197,7 +197,7 @@
 $virusscannerpath{"MCAFEE"}= "/usr/local/uvscan/";      
 $virusscannerpath{"SOPHOS"} = "/usr/local/bin/";   	  
 $virusscannerpath{"TREND"} = "/usr/local/trend/";   	  
-
+$virusscannerpath{"COMMAND"} = "/usr/bin/";
 
 # Antivirus scanner commands
 
@@ -208,13 +208,14 @@
 $viruscmd{"MCAFEE"} = "--summary --noexpire --unzip"; 
 $viruscmd{"SOPHOS"} = "-archive -di -remove -nc";
 $viruscmd{"TREND"} = "-za -d"; 
+$viruscmd{"COMMAND"} = "-all -archive -packed -list -dumb";
 
 $downloads = "/var/www/html/downloads"; # Complete path to downloaded files.
 $downloadsdir = "/downloads/";          # Web path to downloaded files.
 $logfile = "$downloads/viralator.log";	# Web path to the log file
 $wget = "/usr/bin/";	        	# Path to wget 
-#$deleteaction = "deletefile"; 		# use "deletefile" or "mantain"
-$deleteaction = "mantain"; 		# use "deletefile" or "mantain"
+$deleteaction = "deletefile"; 		# use "deletefile" or "mantain"
+#$deleteaction = "mantain"; 		# use "deletefile" or "mantain"
 
 
 ############################################################################
@@ -271,6 +272,7 @@
 $virusfound{"MCAFEE"}{"it"} = "Infettato: .....";	
 $virusfound{"SOPHOS"}{"it"} = "Infettato:";
 $virusfound{"TREND"}{"it"} = "Infettato:";
+$virusfound{"COMMAND"}{"it"} = "[IS][nu][fs][ep][ci][tc][ei][do][:u]s?:?";
 $virusmsg{"it"} = "Contatta l'amministratore del sistema"; 		
 $downloading{"it"} = "scaricamento di";
 $filenotfound{"it"} = "File non trovato";
@@ -306,6 +308,7 @@
 $virusfound{"MCAFEE"}{"en"} = "Infected: .....";			
 $virusfound{"SOPHOS"}{"en"} = "Infected:";
 $virusfound{"TREND"}{"en"} = "Infected:";
+$virusfound{"COMMAND"}{"en"} = "[IS][nu][fs][ep][ci][tc][ei][do][:u]s?:?";
 $virusmsg{"en"} = "Contact Your Systems Administrator"; 		
 $downloading{"en"} = "downloading";
 $filenotfound{"en"} = "File not found";
@@ -645,7 +648,7 @@
    " $filename <br>".$takeawhile{$lang}."</font></b>");
 open(TR1," $virusscanner{$antivirus} $viruscmd{$antivirus} $downloads/\"$filename\" 2>&1|") || die "Error";	
  while(<TR1>) {
-  if ($_ =~ /$virusfound{$antivirus}{$lang} (\s+\d+)/) {
+  if ($_ =~ /$virusfound{$antivirus}{$lang} (.*)/) {
    if ( $1 > 0) {
     print;
     print "\n<p><b>".$virusmsg{$lang}." \n <p>";