From: eldy <>
Date: Sat, 15 Nov 2008 16:20:53 +0000 (+0000)
Subject: Fix: Full list of extrasections was not ordered correctly
X-Git-Tag: AWSTATS_6_9_BETA~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063644ad97002aa3d8b2d688565979eec9f4bd79;p=thirdparty%2FAWStats.git

Fix: Full list of extrasections was not ordered correctly
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 96457ebf..fd21edff 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -26,6 +26,7 @@ Fixes:
 - Fix: [ 1921942 ] html footer is missing from the allextraN report.
 - Fix: [ 1943466 ] error geoip_city_maxmind Can't locate object method "record_
 - Fix: [ 1808277 ] Incorrect function call in geoip_isp_maxmind.pm
+- Fix: Full list of extrasections was not ordered correctly
 - A lot of other fixes.
 - Added missing icons
 
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 1f61c3d1..860b150e 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -14,8 +14,7 @@ require 5.005;
 #use diagnostics;	# Must be used in test mode only. This reduce a lot of process speed
 use strict;
 no strict "refs";
-use Time::Local
-  ; # use Time::Local 'timelocal_nocheck' is faster but not supported by all Time::Local modules
+use Time::Local;	# use Time::Local 'timelocal_nocheck' is faster but not supported by all Time::Local modules
 use Socket;
 
 #------------------------------------------------------------------------------
@@ -8869,8 +8868,8 @@ sub ShowMenuCateg {
 	# Call to plugins' function AddHTMLMenuLink
 	foreach my $pluginname ( keys %{ $PluginsLoaded{'AddHTMLMenuLink'} } ) {
 
-#		my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
-#		eval("$function");
+		# my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
+		# eval("$function");
 		my $function = "AddHTMLMenuLink_$pluginname";
 		&$function( $categ, $menu, $menulink, $menutext );
 	}
@@ -8879,7 +8878,7 @@ sub ShowMenuCateg {
 	}
 	if ( !$linetitle ) { return; }
 
-# At least one entry in menu for this category, we can show categpry and entries
+	# At least one entry in menu for this category, we can show category and entries
 	my $WIDTHMENU1 = ( $FrameName eq 'mainleft' ? $FRAMEWIDTH : 150 );
 	print "<tr><td class=\"awsm\" width=\"$WIDTHMENU1\""
 	  . ( $frame ? "" : " valign=\"top\"" ) . ">"
@@ -13253,7 +13252,7 @@ if ( scalar keys %HTMLOutput ) {
 		&$function();
 	}
 
-	# MENU
+	# MENU (ON LEFT IF FRAME OR TOP)
 	#---------------------------------------------------------------------
 	if ( $ShowMenu || $FrameName eq 'mainleft' ) {
 		my $frame = ( $FrameName eq 'mainleft' );
@@ -13629,11 +13628,12 @@ if ( scalar keys %HTMLOutput ) {
 				%menu     = ();
 				%menulink = ();
 				%menutext = ();
+				my $i=1;
 				foreach ( 1 .. @ExtraName - 1 ) {
-					$menu{"extra$_"}        = 1;
+					$menu{"extra$_"}        = $i++;
 					$menulink{"extra$_"}    = 1;
 					$menutext{"extra$_"}    = $ExtraName[$_];
-					$menu{"allextra$_"}     = 2;
+					$menu{"allextra$_"}     = $i++;
 					$menulink{"allextra$_"} = 2;
 					$menutext{"allextra$_"} = $Message[80];
 				}