From: Stefan Schantl Date: Mon, 11 Aug 2025 17:38:13 +0000 (+0200) Subject: ids.cgi: Allow to configure report summary feature X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cde22e11b1ba763056029e86d80a933925f7a9eb;p=ipfire-2.x.git ids.cgi: Allow to configure report summary feature Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- diff --git a/doc/language_issues.en b/doc/language_issues.en index 84e1ac959..f9f39b023 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1064,12 +1064,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.es b/doc/language_issues.es index 9211ff093..620882672 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1063,6 +1063,10 @@ WARNING: untranslated string: ids invalid mail address = Is or contains an inval WARNING: untranslated string: ids no email recipients = No email recipients given WARNING: untranslated string: ids no email sender = No sender email address specified WARNING: untranslated string: ids provider eol = (EOL) +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: indirect target selection = Indirect target selection WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: mdstat = Mdstat diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c9b2740e8..4f52d7b9d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1051,7 +1051,11 @@ WARNING: untranslated string: ids invalid mail address = Is or contains an inval WARNING: untranslated string: ids no email recipients = No email recipients given WARNING: untranslated string: ids no email sender = No sender email address specified WARNING: untranslated string: ids provider eol = (EOL) +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids rulesets = Rulesets +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: import connection = Import a Connection WARNING: untranslated string: indirect target selection = Indirect target selection WARNING: untranslated string: invalid endpoint = Invalid Endpoint diff --git a/doc/language_issues.it b/doc/language_issues.it index 0fc6a0f5a..c02be127d 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1186,12 +1186,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 3f34a075a..12aa18981 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1192,12 +1192,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 3137890f8..0acc6b2a5 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1311,12 +1311,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2c48a900c..173b5f0fe 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1309,12 +1309,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.tr b/doc/language_issues.tr index bf241dbe1..793a22b5d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1130,12 +1130,16 @@ WARNING: untranslated string: ids provider = Provider WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: ids provider settings = Provider settings WARNING: untranslated string: ids remove rule structures = Remove old rule structures... +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports WARNING: untranslated string: ids reset provider = Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully... WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date. WARNING: untranslated string: ids rulesets = Rulesets WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use. WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset WARNING: untranslated string: ids visit provider website = Visit provider website diff --git a/doc/language_issues.tw b/doc/language_issues.tw index c9d30952a..3b6b449ec 100644 --- a/doc/language_issues.tw +++ b/doc/language_issues.tw @@ -1071,6 +1071,10 @@ WARNING: untranslated string: ids email sender = Sender Address WARNING: untranslated string: ids invalid mail address = Is or contains an invalid mail address. WARNING: untranslated string: ids no email recipients = No email recipients given WARNING: untranslated string: ids no email sender = No sender email address specified +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: indirect target selection = Indirect target selection WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: max bandwidth = Maximum bandwidth diff --git a/doc/language_issues.zh b/doc/language_issues.zh index c9d30952a..3b6b449ec 100644 --- a/doc/language_issues.zh +++ b/doc/language_issues.zh @@ -1071,6 +1071,10 @@ WARNING: untranslated string: ids email sender = Sender Address WARNING: untranslated string: ids invalid mail address = Is or contains an invalid mail address. WARNING: untranslated string: ids no email recipients = No email recipients given WARNING: untranslated string: ids no email sender = No sender email address specified +WARNING: untranslated string: ids reports daily = Daily reports +WARNING: untranslated string: ids reports monthly = Monthly reports +WARNING: untranslated string: ids reports weekly = Weekly reports +WARNING: untranslated string: ids summary reports = Summary reports WARNING: untranslated string: indirect target selection = Indirect target selection WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: max bandwidth = Maximum bandwidth diff --git a/doc/language_missings b/doc/language_missings index 11fdbf54f..8b1220e5b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -163,6 +163,10 @@ < ids no email recipients < ids no email sender < ids provider eol +< ids reports daily +< ids reports monthly +< ids reports weekly +< ids summary reports < indirect target selection < mdstat < offloaded @@ -220,7 +224,11 @@ < ids no email recipients < ids no email sender < ids provider eol +< ids reports daily +< ids reports monthly +< ids reports weekly < ids rulesets +< ids summary reports < ids unsupported provider < import connection < indirect target selection @@ -596,6 +604,9 @@ < ids provider eol < ids provider settings < ids remove rule structures +< ids reports daily +< ids reports monthly +< ids reports weekly < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date @@ -603,6 +614,7 @@ < ids ruleset settings < ids show < ids subscription code required +< ids summary reports < ids the choosen provider is already in use < ids unable to download the ruleset < ids unsupported provider @@ -1246,6 +1258,9 @@ < ids provider eol < ids provider settings < ids remove rule structures +< ids reports daily +< ids reports monthly +< ids reports weekly < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date @@ -1253,6 +1268,7 @@ < ids ruleset settings < ids show < ids subscription code required +< ids summary reports < ids the choosen provider is already in use < ids unable to download the ruleset < ids unsupported provider @@ -2198,6 +2214,9 @@ < ids provider eol < ids provider settings < ids remove rule structures +< ids reports daily +< ids reports monthly +< ids reports weekly < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date @@ -2205,6 +2224,7 @@ < ids ruleset settings < ids show < ids subscription code required +< ids summary reports < ids the choosen provider is already in use < ids unable to download the ruleset < ids unsupported provider @@ -3318,6 +3338,9 @@ < ids provider eol < ids provider settings < ids remove rule structures +< ids reports daily +< ids reports monthly +< ids reports weekly < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date @@ -3325,6 +3348,7 @@ < ids ruleset settings < ids show < ids subscription code required +< ids summary reports < ids the choosen provider is already in use < ids unable to download the ruleset < ids unsupported provider @@ -4032,6 +4056,9 @@ < ids provider eol < ids provider settings < ids remove rule structures +< ids reports daily +< ids reports monthly +< ids reports weekly < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date @@ -4039,6 +4066,7 @@ < ids ruleset settings < ids show < ids subscription code required +< ids summary reports < ids the choosen provider is already in use < ids unable to download the ruleset < ids unsupported provider @@ -4343,6 +4371,10 @@ < ids invalid mail address < ids no email recipients < ids no email sender +< ids reports daily +< ids reports monthly +< ids reports weekly +< ids summary reports < indirect target selection < max bandwidth < offloaded @@ -4397,6 +4429,10 @@ < ids invalid mail address < ids no email recipients < ids no email sender +< ids reports daily +< ids reports monthly +< ids reports weekly +< ids summary reports < indirect target selection < max bandwidth < offloaded diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 362cbec87..fc3e58368 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -575,7 +575,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) { } # Check if the e-mail feature should be used. - if ($cgiparams{'ENABLE_EMAIL'} eq "on") { + if (($cgiparams{'ENABLE_EMAIL'} eq "on") || ($cgiparams{'ENABLE_REPORT_DAILY'} eq "on") || + ($cgiparams{'ENABLE_REPORT_WEEKLY'} eq "on") || ($cgiparams{'ENABLE_REPORT_MONTLY'} eq "on")) { # Check if a sender mail address has been provided. unless($cgiparams{'EMAIL_SENDER'}) { $errormessage = $Lang::tr{'ids no email sender'}; @@ -1036,6 +1037,16 @@ sub show_mainpage() { $checked{'ENABLE_EMAIL'}{'on'} = ''; $checked{'ENABLE_EMAIL'}{$idssettings{'ENABLE_EMAIL'}} = "checked='checked'"; + $checked{'ENABLE_REPORT_DAILY'}{'off'} = ''; + $checked{'ENABLE_REPORT_DAILY'}{'on'} = ''; + $checked{'ENABLE_REPORT_DAILY'}{$idssettings{'ENABLE_REPORT_DAILY'}} = "checked='checked'"; + $checked{'ENABLE_REPORT_WEEKLY'}{'off'} = ''; + $checked{'ENABLE_REPORT_WEEKLY'}{'on'} = ''; + $checked{'ENABLE_REPORT_WEEKLY'}{$idssettings{'ENABLE_REPORT_WEEKLY'}} = "checked='checked'"; + $checked{'ENABLE_REPORT_MONTHLY'}{'off'} = ''; + $checked{'ENABLE_REPORT_MONTHLY'}{'on'} = ''; + $checked{'ENABLE_REPORT_MONTHLY'}{$idssettings{'ENABLE_REPORT_MONTHLY'}} = "checked='checked'"; + # Draw current state of the IDS &Header::opensection(); @@ -1133,7 +1144,7 @@ print < - + @@ -1143,7 +1154,50 @@ print < - + + + + + + +
+ $Lang::tr{'ids summary reports'} +
+ + + + + + + + + + + + + + + + + + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9e064a407..65fa5f38f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1416,6 +1416,9 @@ 'ids provider' => 'Regelset-Anbieter', 'ids provider settings' => 'Regelset-Anbieter-Einstellungen', 'ids remove rule structures' => 'Entferne alte Regelstrukturen...', +'ids reports daily' => 'Täglicher Report', +'ids reports monthly' => 'Monatlicher Report', +'ids reports weekly' => 'Wöchentlicher Report', 'ids reset provider' => 'Providereinstellungen zurücksetzen', 'ids rules update' => 'Regelsatz', 'ids ruleset autoupdate in progress' => 'Der Regelsatz wird gerade aktualisiert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', @@ -1423,6 +1426,7 @@ 'ids ruleset settings' => 'Regelsatzeinstellungen', 'ids rulesets' => 'Regelsätze', 'ids show' => 'Anzeigen', +'ids summary reports' => 'Zusammenfassender Report', 'ids the choosen provider is already in use' => 'Der gewhählte Provider wird bereits verwendet.', 'ids unable to download the ruleset' => 'Das Regelset konnte nicht heruntergeladen werden.', 'ids unsupported provider' => 'Provider wird nicht mehr unterstützt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index cbb964b48..ad3c55969 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1474,6 +1474,9 @@ 'ids provider eol' => '(EOL)', 'ids provider settings' => 'Provider settings', 'ids remove rule structures' => 'Remove old rule structures...', +'ids reports daily' => 'Daily reports', +'ids reports monthly' => 'Monthly reports', +'ids reports weekly' => 'Weekly reports', 'ids reset provider' => 'Reset provider', 'ids rules update' => 'Ruleset', 'ids ruleset autoupdate in progress' => 'Ruleset update in progress. Please wait until all operations have completed successfully...', @@ -1482,6 +1485,7 @@ 'ids rulesets' => 'Rulesets', 'ids show' => 'Show', 'ids subscription code required' => 'The selected ruleset requires a subscription code', +'ids summary reports' => 'Summary reports', 'ids the choosen provider is already in use' => 'The choosen provider is already in use.', 'ids unable to download the ruleset' => 'Unable to download the ruleset', 'ids unsupported provider' => 'Provider is not supported anymore',
+ + + +
+ + + +
+ + +