calamaris: Fix viewing reports.

Fixes that only the last created report could be viewed (#10259).

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index a2f3ab8dff678d5df0474a6c1fabe991566bc063..f4817779402e6e88c0b332e2699bd95e3316ed09 100644 (file)
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/sbin/ovpn-ccd-convert
 var/ipfire/general-functions.pl

diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat
index 19a3693999b0f2b2a650191e2d166c8d4492b28a..4ee60c21d9ad812fa741e7a46093bef4f45350c5 100644 (file)
--- a/html/cgi-bin/logs.cgi/calamaris.dat
+++ b/html/cgi-bin/logs.cgi/calamaris.dat
@@ -98,6 +98,7 @@ if ($reportsettings{'ACTION'} eq $Lang::tr{'calamaris create report'})
        delete $reportsettings{'DAY_END'};
        delete $reportsettings{'MONTH_END'};
        delete $reportsettings{'YEAR_END'};
+       delete $reportsettings{'REPORT'};
 
        &General::writehash("${General::swroot}/proxy/calamaris/settings", \%reportsettings);
 
@@ -493,12 +494,11 @@ END
 if (@reports)
 {
        print "<td><select name='REPORT' size='5'>\n";
-       my $n=0;
        foreach (@reports)
        {
                @reportdata=split(/#/);
                print "\t<option ";
-               if ($n eq '0') { print "selected "; $reportsettings{'REPORT'}=$reportdata[1]; $n++}
+               if ($reportsettings{'REPORT'} eq $reportdata[1]) { print "selected ";}
                print "value='$reportdata[1]'>$reportdata[2] &nbsp;-&nbsp; $reportdata[3]</option>\n";
        }
        print "</select></td>\n";