From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 Nov 2012 09:55:32 +0000 (+0100)
Subject: calamaris: Fix viewing reports.
X-Git-Tag: v2.11-core65~1^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d46bec52993235a8b185a2f040846e9059c3f4e7;p=people%2Fms%2Fipfire-2.x.git

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 a2f3ab8dff..f481777940 100644
--- 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 19a3693999..4ee60c21d9 100644
--- 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";