ids.dat: Only allow downloading daily reports

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 76f7ab472e9e9a29a2c4a7081f7b94c18e0faba7..5dbc9987f63da63d79bc6967d9f4c56267c40bb1 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -391,7 +391,6 @@ WARNING: translation string unused: generate
 WARNING: translation string unused: generate tripwire keys and init
 WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
-WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: genre
 WARNING: translation string unused: gpl i accept these terms and conditions
@@ -996,6 +995,7 @@ WARNING: untranslated string: fwdfw syn flood protection = Enable SYN Flood Prot
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
 WARNING: untranslated string: guardian block ssh brute-force = unknown string

diff --git a/doc/language_issues.en b/doc/language_issues.en
index fe7a17f1f02ed2e731bfd27596042fe55f2479a7..cb22c63df54a2fe866f0e176878886c24e15a168 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -654,6 +654,7 @@ WARNING: untranslated string: download ca certificate = Download CA certificate
 WARNING: untranslated string: download certificate = Download file
 WARNING: untranslated string: download host certificate = Download host certificate
 WARNING: untranslated string: download pkcs12 file = Download PKCS12 file
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: download root certificate = Download root certificate
 WARNING: untranslated string: download tls-auth key = Download tls-auth key
 WARNING: untranslated string: dpd action = Action
@@ -968,6 +969,7 @@ WARNING: untranslated string: gateway ip = Gateway IP
 WARNING: untranslated string: generate a certificate = Generate a certificate:
 WARNING: untranslated string: generate iso = Generate ISO
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: generate root/host certificates = Generate root/host certificates
 WARNING: untranslated string: generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient = Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.
 WARNING: untranslated string: global settings = Global Settings

diff --git a/doc/language_issues.es b/doc/language_issues.es
index f0a6e31ba40c7efe55e60da9c605d6a83b39da16..de9fdbff043448a1baed3e2e2956c822ffdf0682 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1022,6 +1022,7 @@ WARNING: untranslated string: Captive ACTIVATE = unknown string
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: enable disable client = unknown string
 WARNING: untranslated string: enable disable dyndns = unknown string
 WARNING: untranslated string: error message = unknown string
@@ -1029,6 +1030,7 @@ WARNING: untranslated string: extrahd because it is outside the allowed mount pa
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
 WARNING: untranslated string: guardian block ssh brute-force = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index ce55b88ba136959f4d1fadf68d34190fb231f1c2..009286d9fecca55eb54cdec4f92ca4d22e060dd2 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1004,6 +1004,7 @@ WARNING: untranslated string: configuration file = Configuration File
 WARNING: untranslated string: core notice 3 = available.
 WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: done = Done
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: enable disable client = unknown string
 WARNING: untranslated string: enable disable dyndns = unknown string
 WARNING: untranslated string: endpoint = Endpoint
@@ -1016,6 +1017,7 @@ WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
 WARNING: untranslated string: guardian block ssh brute-force = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index ee5135003d0446b16bb7b4e9bbbdcf373a003130..a7d440766d8202f9264f6cab50e009f3de194760 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1051,6 +1051,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: done = Done
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians
 WARNING: untranslated string: duration = Duration
@@ -1120,6 +1121,7 @@ WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
 WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4150411917a2afb59fb3dff0ca4f6b90c2a42144..f90b26efadfd2a482356f16c0629d79185e66101 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1055,6 +1055,7 @@ WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: done = Done
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: download tls-auth key = Download tls-auth key
 WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
@@ -1127,6 +1128,7 @@ WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
 WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index c951b39ce7cfe08c5d702df6316bb2e3128aef43..4e3b4a4efdb4b2b06c0cbd99edf2019f6bd6d56f 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1016,6 +1016,7 @@ WARNING: untranslated string: done = Done
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
 WARNING: untranslated string: downlink = Downlink
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: download tls-auth key = Download tls-auth key
 WARNING: untranslated string: dpd delay = Delay
 WARNING: untranslated string: dpd timeout = Timeout
@@ -1245,6 +1246,7 @@ WARNING: untranslated string: fwhost used = Used
 WARNING: untranslated string: fwhost welcome = Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster.
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: grouptype = Grouptype:
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 738de8fee2ea7c0526395b39be7ed923aa447d18..7e29245c96b718e18830cb349bdf7d444d9e842e 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1014,6 +1014,7 @@ WARNING: untranslated string: done = Done
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
 WARNING: untranslated string: downlink = Downlink
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: download tls-auth key = Download tls-auth key
 WARNING: untranslated string: dpd delay = Delay
 WARNING: untranslated string: dpd timeout = Timeout
@@ -1243,6 +1244,7 @@ WARNING: untranslated string: fwhost used = Used
 WARNING: untranslated string: fwhost welcome = Over here, you can group single hosts, networks and services together, which will creating new rules more easy and faster.
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: grouptype = Grouptype:
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index cb13bc21f4643046f8160e28017cadbcac7b8bdd..c79958b2329fb05a5d6d504efcd21d6d41dc99df 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1033,6 +1033,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: done = Done
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/blocklists/do-not-route-or-peer/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians
 WARNING: untranslated string: duration = Duration
@@ -1066,6 +1067,7 @@ WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
 WARNING: untranslated string: fwhost wg peers = WireGuard Peers
 WARNING: untranslated string: generate ptr = Generate PTR
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
 WARNING: untranslated string: guardian block ssh brute-force = unknown string

diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index 5a9f61b2cc8d95f2228f4f9f4df282ba52219399..71fbaf3c25bdd42dba4e9ac2a457645829d50612 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1030,6 +1030,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: enable disable client = unknown string
 WARNING: untranslated string: enable disable dyndns = unknown string
 WARNING: untranslated string: error message = unknown string
@@ -1037,6 +1038,7 @@ WARNING: untranslated string: extrahd because it is outside the allowed mount pa
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 5a9f61b2cc8d95f2228f4f9f4df282ba52219399..71fbaf3c25bdd42dba4e9ac2a457645829d50612 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1030,6 +1030,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: enable disable client = unknown string
 WARNING: untranslated string: enable disable dyndns = unknown string
 WARNING: untranslated string: error message = unknown string
@@ -1037,6 +1038,7 @@ WARNING: untranslated string: extrahd because it is outside the allowed mount pa
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: fwhost invalid country code = Invalid Country Code
+WARNING: untranslated string: generate report = unknown string
 WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string

diff --git a/doc/language_missings b/doc/language_missings
index b042081ebac8db96e8434d58e87b48f03a366dba..8e0ad72d3f991bb6619700fbf2cc703b2dda87dc 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -66,6 +66,8 @@
 < fwdfw syn flood protection
 < fwhost wg peers
 < g.dtm
+< generate pdf report for
+< generatereport
 < g.lite
 < hostile networks in
 < hostile networks out
@@ -113,6 +115,7 @@
 < reiserfs warning1
 < reiserfs warning2
 < remarks
+< report exporting
 < required
 < routing
 < rss
@@ -156,7 +159,9 @@
 < AES-256-GCM
 < CHACHA20-POLY1305
 < dns servers
+< download report
 < fwhost invalid country code
+< generate pdf report for
 < ids all including informational
 < ids email alerts
 < ids email alert severity
@@ -194,6 +199,7 @@
 < ovpn transport protocol
 < ovpn unsupported cipher selected
 < quality of service
+< report exporting
 < rss
 < rss long
 < transient sheduler attacks
@@ -214,6 +220,7 @@
 < configuration file
 < data transfer
 < done
+< download report
 < endpoint
 < endpoint address
 < endpoint port
@@ -222,6 +229,7 @@
 < fwhost invalid country code
 < fwhost wg peers
 < g.dtm
+< generate pdf report for
 < g.lite
 < hostile networks total
 < ids all including informational
@@ -286,6 +294,7 @@
 < reg_file_data_sampling
 < remarks
 < remote subnets
+< report exporting
 < routing
 < rss
 < rss long
@@ -506,6 +515,7 @@
 < done
 < downfall gather data sampling
 < download apple profile
+< download report
 < drop hostile
 < drop spoofed martians
 < duration
@@ -576,6 +586,7 @@
 < fwhost newlocationgrp
 < fwhost wg peers
 < fw red
+< generate pdf report for
 < generate ptr
 < guaranteed bandwidth
 < guardian
@@ -812,6 +823,7 @@
 < release
 < remarks
 < remote subnets
+< report exporting
 < required
 < required field
 < retbleed
@@ -1164,6 +1176,7 @@
 < done
 < downfall gather data sampling
 < download apple profile
+< download report
 < download tls-auth key
 < drop hostile
 < drop outgoing
@@ -1237,6 +1250,7 @@
 < fwhost newlocationgrp
 < fwhost wg peers
 < fw red
+< generate pdf report for
 < generate ptr
 < guardian
 < hardware vulnerabilities
@@ -1490,6 +1504,7 @@
 < reiserfs warning2
 < remarks
 < remote subnets
+< report exporting
 < required
 < required field
 < retbleed
@@ -1919,6 +1934,7 @@
 < downfall gather data sampling
 < downlink
 < download apple profile
+< download report
 < download tls-auth key
 < dpd delay
 < dpd timeout
@@ -2198,6 +2214,7 @@
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< generate pdf report for
 < generate ptr
 < grouptype
 < guardian
@@ -2509,6 +2526,7 @@
 < release
 < remarks
 < remote subnets
+< report exporting
 < required
 < required field
 < retbleed
@@ -3046,6 +3064,7 @@
 < downfall gather data sampling
 < downlink
 < download apple profile
+< download report
 < download tls-auth key
 < dpd delay
 < dpd timeout
@@ -3327,6 +3346,7 @@
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< generate pdf report for
 < generate ptr
 < grouptype
 < guardian
@@ -3639,6 +3659,7 @@
 < release
 < remarks
 < remote subnets
+< report exporting
 < required
 < required field
 < retbleed
@@ -4025,6 +4046,7 @@
 < done
 < downfall gather data sampling
 < download apple profile
+< download report
 < drop hostile
 < drop spoofed martians
 < duration
@@ -4054,6 +4076,7 @@
 < fwhost invalid country code
 < fwhost wg peers
 < fw red
+< generate pdf report for
 < generate ptr
 < hardware vulnerabilities
 < hostile networks in
@@ -4251,6 +4274,7 @@
 < release
 < remarks
 < remote subnets
+< report exporting
 < required
 < retbleed
 < routing
@@ -4406,7 +4430,9 @@
 < Captive wrong type
 < CHACHA20-POLY1305
 < dns servers
+< download report
 < fwhost invalid country code
+< generate pdf report for
 < guaranteed bandwidth
 < ids all including informational
 < ids email alerts
@@ -4455,6 +4481,7 @@
 < pakfire remove package
 < pakfire updating
 < password has quotation mark
+< report exporting
 < rss
 < rss long
 < transient sheduler attacks
@@ -4470,7 +4497,9 @@
 < Captive wrong type
 < CHACHA20-POLY1305
 < dns servers
+< download report
 < fwhost invalid country code
+< generate pdf report for
 < guaranteed bandwidth
 < ids all including informational
 < ids email alerts
@@ -4519,6 +4548,7 @@
 < pakfire remove package
 < pakfire updating
 < password has quotation mark
+< report exporting
 < rss
 < rss long
 < transient sheduler attacks

diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 9bfcb27170fe057ffd8b56e5dbe232b50f79294b..deebced2164fd4bee4e0a88b4520028c60ff8cba 100644 (file)
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -196,7 +196,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
        exit;
 }
 
-if ($cgiparams{'ACTION'} eq "$Lang::tr{'generate report'}") {
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'download report'}") {
        # Array which contains the report-generator command and it's arguments.
        my @report_cmd = ("$report_generator_binary", "--output=-");
 
@@ -220,20 +220,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'generate report'}") {
                }
        }
 
-       # Parse, which kind of report has been requested.
-       if ($cgiparams{'GENERATE_WHAT'} eq "YEAR") {
-               push(@report_cmd, "--year=$year");
-       } elsif ($cgiparams{'GENERATE_WHAT'} eq "MONTH") {
-               push(@report_cmd, "--month=$month");
-               push(@report_cmd, "--year=$year");
-       } elsif ($cgiparams{'GENERATE_WHAT'} eq "DAY") {
-               push(@report_cmd, "--day=$day");
-               push(@report_cmd, "--month=$month");
-               push(@report_cmd, "--year=$year");
-       } else {
-               # Assign an error message.
-               $errormessage = "Could not generate report - Unsupported request.\n";
-       }
+       # Append the date
+       push(@report_cmd, "--day=$day", "--month=$month", "--year=$year");
 
        # Check if there has been any error.
        unless ($errormessage) {
@@ -284,7 +272,7 @@ print <<END
        </select>
        </td>
        <td width='10%' class='base' align='right'>&nbsp;$Lang::tr{'day'}:&nbsp;</td>
-       <td width='40%'>
+       <td width='30%'>
        <select name='DAY'>
 END
 ;
@@ -302,36 +290,9 @@ print <<END
         <td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='&gt;&gt;' /></td>
        <td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
        <td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'export'}' /></td>
+       <td width='10%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download report'}' /></td>
 </tr>
 </table>
-
-<br><br>
-
-<table width='100%'>
-       <tr>
-               <td>
-                       <h5>$Lang::tr{'report exporting'}</h5>
-               </td>
-       </tr>
-
-       <tr>
-               <td width='50%' class='base'>
-                       $Lang::tr{'generate pdf report for'}
-               </td>
-
-               <td witdh='25%'>
-                       <select name='GENERATE_WHAT'>
-                               <option value='DAY'>$Lang::tr{'selected date'}</option>
-                               <option value='MONTH'>$Lang::tr{'selected month'}</option>
-                               <option value='YEAR'>$Lang::tr{'selected year'}</option>
-                       </select>
-               </td>
-
-               <td witch='25%'>
-                       <input type='submit' name='ACTION' value='$Lang::tr{'generate report'}'>
-               </td>
-       </tr>
-</table>
 </form>
 END
 ;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 09a63b5352cfd5a862574244fd66dc01bd0132b8..00bf427a01b12fdf5698b3abff4392fcbc2a626b 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -898,6 +898,7 @@
 'download host certificate' => 'Host-Zertifikat herunterladen',
 'download new ruleset' => 'Neuen Regelsatz herunterladen',
 'download pkcs12 file' => 'PKCS12-Datei herunterladen',
+'download report' => 'Report herunterladen',
 'download root certificate' => 'Root-Zertifikat herunterladen',
 'download tls-auth key' => 'tls-auth Key herunterladen',
 'dpd action' => 'Aktion für Erkennung toter Gegenstellen (Dead Peer Detection)',
@@ -1326,7 +1327,6 @@
 'generate tripwire keys and init' => 'Tripwire Initalisierung',
 'generatekeys' => 'Neue Schlüssel erzeugen',
 'generatepolicy' => 'Neue Policy erstellen',
-'generatereport' => 'Neuen Report erstellen',
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Die Erzeugung der Root- und Host-Zertifikate kann eine Weile dauern.  Auf älterer Hardware kann dies mehrere Minuten in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
 'genkey' => 'PSK erzeugen',
 'genre' => 'Genre',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8981fa951b601b7f6dde9f7be72bd7148c7eb168..8b7cfb7de6d66a05e2c12287315eaa3c731ffeab 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -947,6 +947,7 @@
 'download host certificate' => 'Download host certificate',
 'download new ruleset' => 'Download new ruleset',
 'download pkcs12 file' => 'Download PKCS12 file',
+'download report' => 'Download Report',
 'download root certificate' => 'Download root certificate',
 'download tls-auth key' => 'Download tls-auth key',
 'dpd action' => 'Action',
@@ -1376,14 +1377,13 @@
 'generate' => 'Generate root/host zertifikate',
 'generate a certificate' => 'Generate a certificate:',
 'generate iso' => 'Generate ISO',
-'generate pdf report for', => 'Generate PDF report for:',
+'generate pdf report for' => 'Generate PDF report for:',
 'generate ptr' => 'Generate PTR',
 'generate root/host certificates' => 'Generate root/host certificates',
 'generate tripwire keys and init' => 'generate tripwire keys and init',
 'generatekeys' => 'Generate Keys',
 'generatepolicy' => 'Generate new policy',
 'generatereport' => 'Generate new report',
-'generate report' => 'Generate report',
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.',
 'genkey' => 'Generate PSK',
 'genre' => 'Genre',
@@ -2305,9 +2305,9 @@
 'remove ca certificate' => 'Remove CA certificate',
 'remove x509' => 'Remove x509',
 'repeat' => 'Repeat',
+'report exporting' => 'Report exporting:',
 'reportfile' => 'Reportfile',
 'reportlevel' => 'Reportlevel',
-'report exporting' => 'Report exporting:',
 'requested data' => '1. Connection Settings:',
 'required' => 'Required',
 'required field' => 'Required field',
@@ -2370,9 +2370,6 @@
 'select dest net' => 'Select a destination net.',
 'select media' => 'Select media <br />(only FAT supported for removable media)',
 'select source net' => 'Select a source net. If you have no ORAGNE or BLUE net configured, you need no DMZ Pinholes.',
-'selected date' => 'Selected date',
-'selected month' => 'Selected month',
-'selected year' => 'Selected year',
 'selecttraffic' => 'Select utilization-overview:',
 'send cr' => 'ISP requires Carriage Return:',
 'send email notification' => 'Enabled, send e-mail notification',