no message

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index cb5a90230cee56f877ace48a30aa3bdf9937f76b..3f34199953fa3e4d2792033201d3fd7f01a0ecb8 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -139,8 +139,8 @@ DirIcons="/icon"
 # Set your primary language.
 # Possible value:
 # cz=Czech, de=German, dk=Danish, du=Dutch, en=English, es=Spanish, fr=French,
-# gr=Greek, it=Italian, kr=Korean, nn=Norwegian Nynorsk, po=Polish,
-# pt=Portuguese, ua=Ukrainian, se=Swedish
+# gr=Greek, hu=Hungarian, it=Italian, kr=Korean, nn=Norwegian Nynorsk,
+# po=Polish, pt=Portuguese, ua=Ukrainian, se=Swedish
 # Default: en
 #
 Lang="en"

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index f512dfd0658044b979e5a3b9d6149b8523085f13..aa2a85d73bad1fd6857da841269c721c1f6ada66 100644 (file)
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -81,7 +81,7 @@ $word, $yearcon, $yearfile, $yearmonthfile, $yeartoprocess) = ();
 %MonthBytes = %MonthHits = %MonthPages = %MonthUnique = %MonthVisits =
 %listofyears = %monthlib = %monthnum = ();
 
-$VERSION="3.0 (build 4)";
+$VERSION="3.1 (build 1)";
 $Lang="en";
 
 # Default value
@@ -346,14 +346,13 @@ $BarImageHorizontal_k = "barrehk.png";
 
 # Robots list
 %RobotHash   = (
-# Some robots that must be declared first to avoid to be confused with another one
-"tiscalifreenet", "TiscaliFreeNet",
 # Main list of robots (found at http://info.webcrawler.com/mak/projects/robots/active.html)
 # This command show how to generate tab list from this file: cat robotslist.txt | sed 's/:/ /' | awk ' /robot-id/ { name=tolower($2); } /robot-name/ { print "\""name"\", \""$0"\"," } ' | sed 's/robot-name *//g' > file
 # Rem: To avoid bad detection, some robots id were removed from this list:
 #      - Robots with ID of 2 letters only
 #      - Robot called "webs"
-# Rem: directhit is changed in direct_hit (its real id)
+# Rem: directhit is changed into direct_hit (its real id)
+# Rem: calif is changed into calif[^r] to avoid confusion between tiscalifreenet browser and calif robot
 "acme.spider", "Acme.Spider",
 "ahoythehomepagefinder", "Ahoy! The Homepage Finder",
 "alkaline", "Alkaline",
@@ -375,7 +374,7 @@ $BarImageHorizontal_k = "barrehk.png";
 "brightnet", "bright.net caching robot",
 "bspider", "BSpider",
 "cactvschemistryspider", "CACTVS Chemistry Spider",
-"calif", "Calif",
+"calif[^r]", "Calif",
 "cassandra", "Cassandra",
 "cgireader", "Digimarc Marcspider/CGI",
 "checkbot", "Checkbot",
@@ -1108,6 +1107,8 @@ sub Check_Config {
        if ($message[74] eq "") { $message[74]="Update now"; }
        if ($message[75] eq "") { $message[75]="Bytes"; }
        if ($message[76] eq "") { $message[76]="Last update"; }
+       if ($message[77] eq "") { $message[77]="Top"; }
+       if ($message[78] eq "") { $message[78]="dd mmm yyyy - HH:MM"; }
 }
 
 #--------------------------------------------------------------------
@@ -1410,6 +1411,27 @@ sub Format_Bytes {
        return "$bytes $message[75]";
 }
 
+#------------------------------------------------------------------------------
+# Function:      Format a date according to message[78] (country date format)
+# Input:         day month year hour min
+#------------------------------------------------------------------------------
+sub Format_Date {
+       my $day=shift;
+       my $month=shift;
+       my $year=shift;
+       my $hour=shift;
+       my $min=shift;
+       my $dateformat=$message[78];
+       $dateformat =~ s/dd/$day/g;
+       $dateformat =~ s/mmm/$monthlib{$month}/g;
+       $dateformat =~ s/mm/$month/g;
+       $dateformat =~ s/yyyy/$year/g;
+       $dateformat =~ s/yy/$year/g;
+       $dateformat =~ s/HH/$hour/g;
+       $dateformat =~ s/MM/$min/g;
+       return "$dateformat";
+}
+
 
 #-------------------------------------------------------
 # MAIN
@@ -2231,8 +2253,7 @@ if ($QueryString =~ /action=unknownip/i) {
                $daycon=substr($_unknownip_l{$key},6,2);
                $hourcon=substr($_unknownip_l{$key},8,2);
                $mincon=substr($_unknownip_l{$key},10,2);
-               if ($Lang == 1) { print "<tr><td>$key</td><td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>"; }
-               else { print "<tr><td>$key</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>"; }
+               print "<tr><td>$key</td><td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>";
        }
        &tab_end;
        &html_end;
@@ -2251,8 +2272,7 @@ if ($QueryString =~ /action=unknownrefererbrowser/i) {
                $hourcon=substr($_unknownrefererbrowser_l{$key},8,2);
                $mincon=substr($_unknownrefererbrowser_l{$key},10,2);
                $key =~ s/<script.*$//gi;                               # This is to avoid 'Cross Site Scripting attacks'
-               if ($Lang == 1) { print "<tr><td CLASS=LEFT>$key</td><td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>"; }
-               else { print "<tr><td CLASS=LEFT>$key</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>"; }
+               print "<tr><td CLASS=LEFT>$key</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>";
        }
        &tab_end;
        &html_end;
@@ -2271,8 +2291,7 @@ if ($QueryString =~ /action=unknownreferer/i) {
                $hourcon=substr($_unknownreferer_l{$key},8,2);
                $mincon=substr($_unknownreferer_l{$key},10,2);
                $key =~ s/<script.*$//gi;                               # This is to avoid 'Cross Site Scripting attacks'
-               if ($Lang == 1) { print "<tr><td CLASS=LEFT>$key</td><td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>"; }
-               else { print "<tr><td CLASS=LEFT>$key</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>"; }
+               print "<tr><td CLASS=LEFT>$key</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>";
        }
        &tab_end;
        &html_end;
@@ -2636,7 +2655,7 @@ if ($rest_p > 0) {        # All other domains (known or not)
 #--------------------------
 print "$CENTER<a name=\"VISITOR\"></a><BR>";
 $MaxNbOfHostsShown = $TotalHosts if $MaxNbOfHostsShown > $TotalHosts;
-$tab_titre="TOP $MaxNbOfHostsShown $message[55] $TotalHosts $message[26] ($TotalUnique $message[11])";
+$tab_titre="$Message[77] $MaxNbOfHostsShown $message[55] $TotalHosts $message[26] ($TotalUnique $message[11])";
 &tab_head;
 print "<TR bgcolor=#$color_TableBGRowTitle><TH>$message[18]</TH><TH bgcolor=#$color_p>$message[56]</TH><TH bgcolor=#$color_h>$message[57]</TH><TH bgcolor=#$color_k>$message[75]</TH><TH>$message[9]</TH></TR>\n";
 $count=0;$total_p=0;$total_h=0;$total_k=0;
@@ -2653,8 +2672,7 @@ foreach $key (@sorthosts_p) {
                        $mincon=substr($_hostmachine_l{$key},10,2);
                        print "<tr><td CLASS=LEFT>$key</td><TD>$_hostmachine_p{$key}</TD><TD>$_hostmachine_h{$key}</TD><TD>".Format_Bytes($_hostmachine_k{$key})."</TD>";
                        if ($daycon ne "") {
-                               if ($Lang != 0) { print "<td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>"; }
-                               else { print "<td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>"; }
+                               print "<td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>";
                        }
                        else {
                                print "<td>-</td>";
@@ -2689,8 +2707,7 @@ foreach $key (@sortrobot) {
        $daycon=substr($_robot_l{$key},6,2);
        $hourcon=substr($_robot_l{$key},8,2);
        $mincon=substr($_robot_l{$key},10,2);
-       if ($Lang != 0) { print "<tr><td CLASS=LEFT>$RobotHash{$key}</td><td>$_robot_h{$key}</td><td>$daycon/$monthcon/$yearcon - $hourcon:$mincon</td></tr>"; }
-       else { print "<tr><td CLASS=LEFT>$RobotHash{$key}</td><td>$_robot_h{$key}</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>"; }
+       print "<tr><td CLASS=LEFT>$RobotHash{$key}</td><td>$_robot_h{$key}</td><td>$daycon $monthlib{$monthcon} $yearcon - $hourcon:$mincon</td></tr>";
 }
 &tab_end;
 

diff --git a/wwwroot/cgi-bin/lang/awstats-en.txt b/wwwroot/cgi-bin/lang/awstats-en.txt
index 9185391d27c09b53d558f07490748a6e09e30a36..0943e4e856ca3ae328c5cdc5b273ee78d3e4a7a4 100644 (file)
--- a/wwwroot/cgi-bin/lang/awstats-en.txt
+++ b/wwwroot/cgi-bin/lang/awstats-en.txt
@@ -71,8 +71,10 @@ message68=Sep
 message69=Oct
 message70=Nov
 message71=Dec
-message72=
+message72=Navigation
 message73=Day statistics
 message74=Update now
 message75=Bytes
-message76=Last update
\ No newline at end of file
+message76=Last update
+message77=Top
+message78=dd mmm yyyy - HH:MM