New feature: ShowFlagLinks can now accept list of all wanted flags for translation...

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index e4bdbb39bf6e3f4b429b873b90cd43761dab38c2..10cda85b30a7ad853d5bbc14e69ee382e44114fa 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -341,12 +341,13 @@ ShowKeyphrasesStats=1
 ShowKeywordsStats=1
 ShowHTTPErrorsStats=1
 
-# Flags with link to other languages translation are visible.
+# List of visible flags with link to other language translations.
+# If you don't want any flag link, set ShowFlagLinks to "".
 # This parameter is used only if ShowHeader is set to 1.
-# Possible values: 1 or 0
-# Default: 1
+# Possible values: "" or "language_codes_separated_by_space"
+# Default: "en es fr it nl es"
 #
-ShowFlagLinks=1
+ShowFlagLinks="en fr de it nl es"
 
 # Each URL shown in stats report views are links you can click.
 # Possible values: 1 or 0

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index f3cb8105bcee1783dc1982a18556eeda01437f4a..13b0424d9b8425cde8b65073e07dfcf6e406a272 100644 (file)
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -78,7 +78,7 @@ $found, $internal_link) = ();
 %MonthBytes = %MonthHits = %MonthHostsKnown = %MonthHostsUnknown = %MonthPages = %MonthUnique = %MonthVisits =
 %monthlib = %monthnum = ();
 
-$VERSION="3.2 (build 10)";
+$VERSION="3.2 (build 11)";
 $Lang="en";
 
 # Default value
@@ -1271,7 +1271,6 @@ sub Check_Config {
        if ($ShowKeywordsStats !~ /[0-1]/)            { $ShowKeywordsStats=1; }
        if ($ShowHTTPErrorsStats !~ /[0-1]/)          { $ShowHTTPErrorsStats=1; }
        if ($ShowAuthenticatedUsers !~ /[0-1]/)       { $ShowAuthenticatedUsers=1; }
-       if ($ShowFlagLinks !~ /[0-1]/)                { $ShowFlagLinks=1; }
        if ($ShowLinksOnURL !~ /[0-1]/)               { $ShowLinksOnURL=1; }
        if ($DetailedReportsOnNewWindows !~ /[0-1]/)  { $DetailedReportsOnNewWindows=1; }
        if ($BarWidth !~ /^[\d][\d]*/)                { $BarWidth=260; }
@@ -1848,23 +1847,25 @@ sub Init_HashArray {
 }
 
 #--------------------------------------------------------------------
-# Function:      Show flags for 5 major languages
-# Input:         Languade id (en, fr, ...)
+# Function:      Show flags for other language translations
+# Input:         Current languade id (en, fr, ...)
 #--------------------------------------------------------------------
 sub Show_Flag_Links {
-       my $Lang = shift;
-       my @lngcode = ();
-       if ($ShowFlagLinks == 1) { 
-               $lngcode[0]="English en";
-               $lngcode[1]="French fr";
-               $lngcode[2]="Dutch nl";
-               $lngcode[3]="Spanish es";
-               $lngcode[4]="Italian it";
-               $lngcode[5]="German de";
-               print "<br>\n";
-               for (0..5) {            # Only flags for 5 major languages
-                       my ($lng, $code) = split(/\s+/, $lngcode[$_]);
-                       if ($Lang ne $code) { print "<a href=\"$DirCgi$PROG.$Extension?".($SiteConfig?"config=$SiteConfig&":"")."year=$YearRequired&month=$MonthRequired&lang=$code\"><img src=\"$DirIcons\/flags\/$code.png\" height=14 border=0 alt=\"$lng\" title=\"$lng\"></a>&nbsp;\n"; }
+       my $CurrentLang = shift;
+       if ($ShowFlagLinks eq "0") { $ShowFlagLinks = ""; }                                             # For backward compatibility
+       if ($ShowFlagLinks eq "1") { $ShowFlagLinks = "en fr de it nl es"; }    # For backward compatibility
+       my @flaglist=split(/\s+/,$ShowFlagLinks);
+       print "<br>\n";
+       foreach my $flag (@flaglist) {
+               if ($flag ne $CurrentLang) {
+                       my $lng=$flag;
+                       if ($flag eq "en") { $lng="English"; }
+                       if ($flag eq "fr") { $lng="French"; }
+                       if ($flag eq "de") { $lng="German"; }
+                       if ($flag eq "it") { $lng="Italian"; }
+                       if ($flag eq "nl") { $lng="Dutch"; }
+                       if ($flag eq "es") { $lng="Spanish"; }
+                       print "<a href=\"$DirCgi$PROG.$Extension?".($SiteConfig?"config=$SiteConfig&":"")."year=$YearRequired&month=$MonthRequired&lang=$flag\"><img src=\"$DirIcons\/flags\/$flag.png\" height=14 border=0 alt=\"$lng\" title=\"$lng\"></a>&nbsp;\n";
                }
        }
 }