Index: /trunk/plugins/nikto_core.plugin
===================================================================
--- /trunk/plugins/nikto_core.plugin	(revision 457)
+++ /trunk/plugins/nikto_core.plugin	(revision 458)
@@ -1,3 +1,3 @@
-#VERSION,2.1.1
+#VERSION,2.1.3
 # $Id$
 ###############################################################################
@@ -225,7 +225,7 @@
 
     # add those generic type holders back as real files
-    $REQS{"/$rs/"} = "DIRECTORY";
-    $REQS{"/$rs"}  = "NONE";
-    $REQS{"/.$rs"} = "DOTFILE";
+    $REQS{'/$rs/'} = "DIRECTORY";
+    $REQS{'/$rs'}  = "NONE";
+    $REQS{'/.$rs'} = "DOTFILE";
 
     foreach my $file (keys %REQS) {
@@ -273,6 +273,6 @@
 
     my $cooked = rm_active_content($content);
-    $FoF{"index.php"}{'match'} = LW2::md4($cooked);
-    $FoF{"index.php"}{'type'}  = "HASH";
+    $FoF{'index.php'}{'match'} = LW2::md4($cooked);
+    $FoF{'index.php'}{'type'}  = "HASH";
 
     return;
@@ -285,13 +285,19 @@
     my ($cont, $file) = @_;
 
-    # Dates
-    $cont =~ s/(?:[0-9]{4}|[0-9]{1,2})[-.\/][0-9]{1,2}[-.\/](?:[0-9]{4}|[0-9]{1,2})//g;
-    $cont =~ s/(?:([0-9]{2}:[0-9]{2}(?::[0-9]{2})?)|(?:[0-9]{8,14}|[0-9]{6}))//g;
+    # Dates/Times
+    $cont =~ s/[12][0-9]{3}[-.\/][1-3]?[0-9][-.\/][1-3]?[0-9]//g;    # 2001-12-12
+    $cont =~ s/[1-3]?[0-9][-.\/][1-3]?[0-9][-.\/][12][0-9]{3}//g;    # 12-12-2002
+    $cont =~ s/[0-9]{8,14}//g;                                       # timestamp
+    $cont =~ s/[0-9]{6}//g;                                          # timestamp
+    $cont =~ s/[0-9]{2}:[0-9]{2}(?::[0-9]{2})?//g;                   #12:11:33
     $cont =~
-      s/(?:mon|tue|wed|thu|fri|sat|sun),? [0-9]{1,2} (?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec) [0-9]{4} (?:[0-9]{2}:[0-9]{2}:?(?:[0-9]{2})?)?//ig;
+      s/(?:mon|tue|wed|thu|fri|sat|sun),? [1-3]?[0-9] (?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)//ig;
+    $cont =~ s/[12][0-9]{3}\s?(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\s?[1-3]?[0-9]//gi
+      ;                                                              # 2009 jan 29
     $cont =~
-      s/(?:[0-9]{2,4})? ?(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(?:[0-9]{2,4})?\/?(?:[0-9]{2})?(?:[0-9]{2})?//gi;
-    $cont =~ s/[0-9\.]+ second//gi;    # page load time
-    $cont =~ s/[0-9]+ queries//gi;     # wordpress
+      s/[1-3]?[0-9]\s?(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[, ]?(?:[12][0-9]{3})?//gi
+      ;                                                              # 29 Jan 2009
+    $cont =~ s/[0-9\.]+ second//gi;                                  # page load time
+    $cont =~ s/[0-9]+ queries//gi;                                   # wordpress
 
     # URI, if provided, plus encoded versions of it