Merge pull request #49 from fbonzon/develop

Add web fonts to default NotPageList, add support for GPX and JSON files, and minor fixes

wwwroot/cgi-bin/awstats.model.conf

@@ -187,16 +187,16 @@ HostAliases="localhost 127.0.0.1 REGEX[myserver\.com$]"
 # 1 - DNS Lookup is fully enabled
 # 2 - DNS Lookup is made only from static DNS cache file (if it exists)
 # Default: 2
-# 
+#
 DNSLookup=2
 
 
 # For very large sites, setting DNSLookup to 0 (or 2) might be the only
 # reasonable choice. DynamicDNSLookup allows to resolve host names for
 # items shown in html tables only, when data is output on reports instead
-# of resolving once during log analysis step. 
+# of resolving once during log analysis step.
 # Possible values:
-# 0 - No dynamic DNS lookup 
+# 0 - No dynamic DNS lookup
 # 1 - Dynamic DNS lookup enabled
 # 2 - Dynamic DNS lookup enabled (including static DNS cache file as a second
 #     source)
@@ -205,7 +205,7 @@ DNSLookup=2
 DynamicDNSLookup=0
 
 
-# When AWStats updates its statistics, it stores results of its analysis in 
+# When AWStats updates its statistics, it stores results of its analysis in
 # files (AWStats database). All those files are written in the directory
 # defined by the "DirData" parameter. Set this value to the directory where
 # you want AWStats to save its database and working files into.
@@ -257,7 +257,7 @@ AllowToUpdateStatsFromBrowser=0
 
 
 # AWStats saves and sorts its database on a month basis (except if using
-# databasebreak option from command line). 
+# databasebreak option from command line).
 # However, if you choose the -month=all from command line or
 # value '-Year-' from CGI combo form to have a report for all year, AWStats
 # needs to reload all data for full year (each month), and sort them,
@@ -369,7 +369,7 @@ AllowAccessFromWebToFollowingIPAddresses=""
 
 # If the "DirData" directory (see above) does not exist, AWStats return an
 # error. However, you can ask AWStats to create it.
-# This option can be used by some Web Hosting Providers that has defined a 
+# This option can be used by some Web Hosting Providers that has defined a
 # dynamic value for DirData (for example DirData="/home/__REMOTE_USER__") and
 # don't want to have to create a new directory each time they add a new user.
 # Change : Effective immediately
@@ -404,9 +404,9 @@ BuildReportFormat=html
 # for both command line user and default web server user (nobody for Unix,
 # IUSR_xxx for IIS/Windows,...).
 # To avoid permission problems between update process (run by an admin user)
-# and CGI process (ran by a low level user), AWStats can save its database 
+# and CGI process (ran by a low level user), AWStats can save its database
 # files with read and write permissions for everyone.
-# By default, AWStats keeps default user permissions on updated files. If you 
+# By default, AWStats keeps default user permissions on updated files. If you
 # set AllowToUpdateStatsFromBrowser to 1, you can change this parameter to 1.
 # Change : Effective for new updates only
 # Possible values: 0 or 1
@@ -596,9 +596,9 @@ OnlyFiles=""
 # Change : Effective for new updates only
 # Example: "css js class gif jpg jpeg png bmp ico rss xml swf zip arj rar gz z bz2 wav mp3 wma mpg avi"
 # Example: ""
-# Default: "css js class gif jpg jpeg png bmp ico rss xml swf"
+# Default: "css js class gif jpg jpeg png bmp ico rss xml swf eot woff woff2"
 #
-NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf"
+NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf eot woff woff2"
 
 
 # By default, AWStats considers that records found in web log file are
@@ -607,7 +607,7 @@ NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf"
 # Note that HTTP 'control codes', like redirection (302, 305) are not added by
 # default in this list as they are not pages seen by a visitor but are
 # protocol exchange codes to tell the browser to ask another page. Because
-# this other page will be counted and seen with a 200 or 304 code, if you 
+# this other page will be counted and seen with a 200 or 304 code, if you
 # add such codes, you will have 2 pages viewed reported for only one in facts.
 # Change : Effective for new updates only
 # Example: "200 304 302 305"
@@ -642,7 +642,7 @@ TrapInfosForHTTPErrorCodes = "400 403 404"
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0
-# 
+#
 AuthenticatedUsersNotCaseSensitive=0
 
 
@@ -652,7 +652,7 @@ AuthenticatedUsersNotCaseSensitive=0
 # Change : Effective for new updates only
 # Possible values: 0 or 1
 # Default: 0
-# 
+#
 URLNotCaseSensitive=0
 
 
@@ -682,14 +682,14 @@ URLQuerySeparators="?;"
 # Warning, when set to 1, memory required to run AWStats is dramatically
 # increased if you have a lot of changing URLs (for example URLs with a random
 # id inside). Such web sites should not set this option to 1 or use seriously
-# the next parameter URLWithQueryWithOnlyFollowingParameters (or eventually 
+# the next parameter URLWithQueryWithOnlyFollowingParameters (or eventually
 # URLWithQueryWithoutFollowingParameters).
 # Change : Effective for new updates only
 # Possible values:
 # 0 - URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used     (ie: "/mypage.html?p=x&q=y")
 # Default: 0
-# 
+#
 URLWithQuery=0
 
 
@@ -707,7 +707,7 @@ URLWithQuery=0
 # Change : Effective for new updates only
 # Example: "param"
 # Default: ""
-# 
+#
 URLWithQueryWithOnlyFollowingParameters=""
 
 
@@ -725,7 +725,7 @@ URLWithQueryWithOnlyFollowingParameters=""
 # Change : Effective for new updates only
 # Example: "PHPSESSID jsessionid"
 # Default: ""
-# 
+#
 URLWithQueryWithoutFollowingParameters=""
 
 
@@ -738,7 +738,7 @@ URLWithQueryWithoutFollowingParameters=""
 # 0 - Referrer URLs are cleaned from the query string (ie: "/mypage.html")
 # 1 - Full URL with query string is used      (ie: "/mypage.html?p=x&q=y")
 # Default: 0
-# 
+#
 URLReferrerWithQuery=0
 
 
@@ -950,7 +950,7 @@ DirLang="./lang"
 # Possible values: 0 or 1
 # Default: 1
 #
-ShowMenu=1					
+ShowMenu=1
 
 
 # You choose here which reports you want to see in the main page and what you
@@ -1050,12 +1050,12 @@ ShowFileTypesStats=HB
 # Show file size chart (Not yet available)
 # Context: Web, Streaming, Mail, Ftp
 # Default: 1, Possible column codes: None
-ShowFileSizesStats=0	
+ShowFileSizesStats=0
 
 # Show downloads chart.
 # Context: Web, Streaming, Ftp
 # Default: HB, Possible column codes: HB
-ShowDownloadsStats=HB	
+ShowDownloadsStats=HB
 
 # Show operating systems chart
 # Context: Web, Streaming, Ftp
@@ -1244,7 +1244,7 @@ HTMLEndSection=""
 
 
 # By default AWStats page contains meta tag robots=noindex,nofollow
-# If you want to have your statistics to be indexed, set this option to 1. 
+# If you want to have your statistics to be indexed, set this option to 1.
 # Default: 0
 #
 MetaRobot=0
@@ -1292,7 +1292,7 @@ color_textpercent="606060"		# Color of text for percent values (Default = "60606
 color_titletext="000000"		# Color of text title within colored Title Rows (Default = "000000")
 color_weekend="EAEAEA"			# Color for week-end days (Default = "EAEAEA")
 color_link="0011BB"				# Color of HTML links (Default = "0011BB")
-color_hover="605040"			# Color of HTML on-mouseover links (Default = "605040") 
+color_hover="605040"			# Color of HTML on-mouseover links (Default = "605040")
 color_u="FFAA66"				# Background color for number of unique visitors (Default = "FFAA66")
 color_v="F4F090"				# Background color for number of visites (Default = "F4F090")
 color_p="4477DD"				# Background color for number of pages (Default = "4477DD")
@@ -1316,16 +1316,16 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: Tooltips
 # REQUIRED MODULES: None
 # PARAMETERS: None
-# DESCRIPTION: Add tooltips pop-up help boxes to HTML report pages.  
+# DESCRIPTION: Add tooltips pop-up help boxes to HTML report pages.
 # NOTE: This will increased HTML report pages size, thus server load and bandwidth.
 #
 #LoadPlugin="tooltips"
 
 # PLUGIN: DecodeUTFKeys
 # REQUIRED MODULES: Encode and URI::Escape
 # PARAMETERS: None
-# DESCRIPTION: Allow AWStats to show correctly (in language charset) 
-# keywords/keyphrases strings even if they were UTF8 coded by the 
+# DESCRIPTION: Allow AWStats to show correctly (in language charset)
+# keywords/keyphrases strings even if they were UTF8 coded by the
 # referer search engine.
 #
 #LoadPlugin="decodeutfkeys"
@@ -1341,7 +1341,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: HashFiles
 # REQUIRED MODULES: Storable
 # PARAMETERS: None
-# DESCRIPTION: AWStats DNS cache files are read/saved as native hash files. 
+# DESCRIPTION: AWStats DNS cache files are read/saved as native hash files.
 # This increases DNS cache files loading speed, above all for very large web sites.
 #
 #LoadPlugin="hashfiles"
@@ -1350,7 +1350,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: UserInfo
 # REQUIRED MODULES: None
 # PARAMETERS: None
-# DESCRIPTION: Add a text (Firtname, Lastname, Office Department, ...) in 
+# DESCRIPTION: Add a text (Firtname, Lastname, Office Department, ...) in
 # authenticated user reports for each login value.
 # A text file called userinfo.myconfig.txt, with two fields (first is login,
 # second is text to show, separated by a tab char) must be created in DirData
@@ -1393,7 +1393,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PARAMETERS: None
 # DESCRIPTION: Time reported by -showsteps option is in millisecond. For debug purpose.
 #
-#LoadPlugin="timehires"		
+#LoadPlugin="timehires"
 
 # PLUGIN: TimeZone
 # REQUIRED MODULES: Time::Local
@@ -1424,13 +1424,13 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: GraphGoogleChartAPI
 # REQUIRED MODULES: None
 # PARAMETERS: None
-# DESCRIPTION: Replaces the standard charts with free Google API generated images 
-# in HTML reports. If country data is available and more than one country has hits, 
+# DESCRIPTION: Replaces the standard charts with free Google API generated images
+# in HTML reports. If country data is available and more than one country has hits,
 # a map will be generated using Google Visualizations.
-# Note: The machine where reports are displayed must have Internet access for the 
-# charts to be generated. The only data sent to Google includes the statistic numbers, 
+# Note: The machine where reports are displayed must have Internet access for the
+# charts to be generated. The only data sent to Google includes the statistic numbers,
 # legend names and country names.
-# Warning: This plugin is not compatible with option BuildReportFormat=xhtml. 
+# Warning: This plugin is not compatible with option BuildReportFormat=xhtml.
 #
 #LoadPlugin="graphgooglechartapi"
 
@@ -1453,7 +1453,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: GeoIP
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoip.dat[+/pathto/override.txt]]
-# DESCRIPTION: Builds a country chart and adds an entry to the hosts 
+# DESCRIPTION: Builds a country chart and adds an entry to the hosts
 # table with country name
 # Replace spaces in the path of geoip data file with string "%20".
 #
@@ -1462,7 +1462,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: GeoIP6
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind, version >= 1.40)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/geoipv6.dat[+/pathto/override.txt]]
-# DESCRIPTION: Builds a country chart and adds an entry to the hosts 
+# DESCRIPTION: Builds a country chart and adds an entry to the hosts
 # table with country name
 # works with IPv4 and also IPv6 addresses
 # Replace spaces in the path of geoip data file with string "%20".
@@ -1481,9 +1481,9 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: GeoIP_ASN_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPASN.dat[+/pathto/override.txt][+http://linktoASlookup]]
-# DESCRIPTION: This plugin adds a chart of AS numbers where the host IP address is registered. 
-# This plugin can display some ISP information if included in the database. You can also provide 
-# a link that will be used to lookup additional registration data. Put the link at the end of 
+# DESCRIPTION: This plugin adds a chart of AS numbers where the host IP address is registered.
+# This plugin can display some ISP information if included in the database. You can also provide
+# a link that will be used to lookup additional registration data. Put the link at the end of
 # the parameter string and the report page will include the link with the full AS number at the end.
 # Replace spaces in the path of geoip data file with string "%20".
 #
@@ -1492,7 +1492,7 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 # PLUGIN: GeoIP_Region_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
 # PARAMETERS: [GEOIP_STANDARD | GEOIP_MEMORY_CACHE] [/pathto/GeoIPRegion.dat[+/pathto/override.txt]]
-# DESCRIPTION:This plugin adds a chart of hits by regions. Only regions for US and 
+# DESCRIPTION:This plugin adds a chart of hits by regions. Only regions for US and
 # Canada can be detected.
 # Replace spaces in the path of geoip data file with string "%20".
 #

wwwroot/cgi-bin/lib/mime.pm

@@ -8,16 +8,16 @@
 #package AWSMIME;
 
 # MimeHashFamily
-# This is a hash table of mime groupings and descriptions. 
-# Report icons will appear if names the same as a family, e.g.
-# if you have a "text.png" icon in the icon/mime directory, the
-# report will load the icon
-# Format: 	'family', 'descriptive text',
+# This is a hash table of mime groupings and descriptions.
+# Report icons will appear if file name is the same as a family,
+# e.g. if you have a "text.png" icon in the icon/mime directory,
+# the report will load the icon
+# Format: 'family', 'descriptive text',
 #---------------------------------------------------------------
 %MimeHashFamily = (
 'text',      'Text file',
 'page',      'HTML or XML static page',
-'script',    'Dynamic Html page or Script file',
+'script',    'Dynamic HTML page or Script file',
 'pl',        'Dynamic Perl Script file',
 'php',       'Dynamic PHP Script file',
 'image',     'Image',
@@ -26,7 +26,8 @@
 'archive',   'Archive',
 'audio',     'Audio file',
 'video',     'Video file',
-'jscript',	 'JavaScript file',
+'jscript',   'JavaScript file',
+'json',      'JavaScript Object Notation file',
 'vbs',       'Visual Basic script',
 'conf',      'Config file',
 'css',       'Cascading Style Sheet file',
@@ -45,23 +46,24 @@
 'ttf',       'TrueType scalable font file',
 'fon',       'Font file',
 'pdf',       'Adobe Acrobat file',
-'dotnet',	 'Dot Net Dynamic Script or File',
-'mdb', 		 'MS Database Object',
-'crystal',	 'Crystal Reports data or file',
-'ooffice',	 'Open Office Document',
-'encrypt',	 'Encrypted document',
+'dotnet',    'Dot Net Dynamic Script or File',
+'mdb',       'MS Database Object',
+'crystal',   'Crystal Reports data or file',
+'ooffice',   'Open Office Document',
+'encrypt',   'Encrypted document',
+'gpx',       'GPS Exchange Format file',
 );
 
 # MimeHashLib
 # This is a hash of arrays where the key is a specific file extension
 # and the array is a list of family and file type, e.g. 'd' for download
 # If a file does not have a type defined, it is counted as a page. Each
 # mime entry can have only one type
-# Format:	'extension', ['family', 'type'],
+# Format: 'extension', ['family', 'type'],
 # Valid Types:
-#		i - image
-#		d - download
-#		p - page
+#   i - image
+#   d - download
+#   p - page
 #---------------------------------------------------------------
 %MimeHashLib=(
 # Text file
@@ -82,7 +84,7 @@
 # HTML Dynamic pages or script
 'asp',['script',''],
 'aspx',['dotnet',''],
-'ashx',['dotnet',''], 
+'ashx',['dotnet',''],
 'asmx',['dotnet',''],
 'axd', ['dotnet',''],
 'cfm',['script',''],
@@ -138,6 +140,7 @@
 'lit',['lit','d'],
 'mdb',['mdb',''],
 'rpt',['crystal',''],
+'gpx',['gpx','d'],
 # Package
 'rpm',[($LogType eq 'S'?'audio':'package'),'d'],
 'deb',['package','d'],
@@ -191,6 +194,7 @@
 'css',['css',''],
 'ini',['conf',''],
 'dtd',['dtd',''],
+'json',['json',''],
 # Program
 'exe',['runtime',''],
 'jnlp',['jnlp',''],