From b645f7fc8675a9caa014b83dff6e7d012a4802c8 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sat, 16 Apr 2022 15:12:58 +0200 Subject: [PATCH] ids.cgi: Do not longer use hard-coded status messages in oinkmaster_web() function. Signed-off-by: Stefan Schantl --- html/cgi-bin/ids.cgi | 14 +++++++------- langs/de/cgi-bin/de.pl | 5 +++++ langs/en/cgi-bin/en.pl | 7 +++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 053520b579..1d4c3928c1 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1862,34 +1862,34 @@ sub oinkmaster_web () { print "

\n"; # Cleanup the rules directory before filling it with the new rulests. - &_add_to_notice("Remove old rule structures..."); + &_add_to_notice("$Lang::tr{'ids remove rule structures'}"); &IDS::_cleanup_rulesdir(); # Loop through the array of enabled providers. foreach my $provider (@enabled_providers) { - &_add_to_notice("Extracting ruleset for provider: $provider"); + &_add_to_notice("$Lang::tr{'ids extract ruleset'} $provider"); # Call the extractruleset function. &IDS::extractruleset($provider); } # Call function to process the ruleset and do all modifications. - &_add_to_notice("Adjust rules and add user defined customizations..."); + &_add_to_notice("$Lang::tr{'ids adjust ruleset'}"); &IDS::process_ruleset(@enabled_providers); # Call function to merge the classification files. - &_add_to_notice("Merging classifications ..."); + &_add_to_notice("$Lang::tr{'ids merge classifications'}"); &IDS::merge_classifications(@enabled_providers); # Call function to merge the sid to message mapping files. - &_add_to_notice("Merging sid to message files ..."); + &_add_to_notice("$Lang::tr{'ids merge sid files'}"); &IDS::merge_sid_msg(@enabled_providers); # Cleanup temporary directory. - &_add_to_notice("Cleanup temporary directory ..."); + &_add_to_notice("$Lang::tr{'ids cleanup tmp dir'}"); &IDS::cleanup_tmp_directory(); # Finished - print a notice. - &_add_to_notice("Finished..."); + &_add_to_notice("$Lang::tr{'ids finished'}"); # Close the working notice. &_close_working_notice(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0be0976092..148c4323b4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1377,15 +1377,19 @@ 'idle timeout' => 'Leerlaufwartezeit in Minuten (0 zum Deaktivieren):', 'idle timeout not set' => 'Leerlaufwartezeit nicht angegeben.', 'ids add provider' => 'Provider hinzufügen', +'ids adjust ruleset' => 'Regelset anpassen und Benutzermodifikationen übernehmen...', 'ids apply' => 'Übernehmen', 'ids apply ruleset changes' => 'Regeländerungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', 'ids automatic rules update' => 'Automatische Regelaktualisierung', +'ids cleanup tmp dir' => 'Temporäres Verzeichnis aufräumen...', 'ids autoupdates' => 'Automatische Updates', 'ids could not add provider' => 'Provider konnte nicht hinzugefügt werden', 'ids customize ruleset' => 'Regelset anpassen', 'ids download new ruleset' => 'Das neue Regelset wird heruntergeladen und entpackt. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', 'ids enable' => 'Einbruchsverhinderungssystem aktivieren', 'ids enable automatic updates' => 'Automatische Updates aktivieren', +'ids extract ruleset' => 'Entpacke Regelset von:', +'ids finished' => 'Fertig...', 'ids force ruleset update' => 'Regelset jetzt aktualisieren', 'ids hide' => 'Verstecken', 'ids ignored hosts' => 'Ausnahmeliste', @@ -1399,6 +1403,7 @@ 'ids oinkcode required' => 'Für den ausgewählten Regelsatz wird ein Abonnement oder ein Oinkcode benötigt', 'ids provider' => 'Regelset-Anbieter', 'ids provider settings' => 'Regelset-Anbieter-Einstellungen', +'ids remove rule structures' => 'Entferne alte Regelstrukturen...', '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...', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d984226216..975b3f58d4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1421,27 +1421,34 @@ 'idle timeout' => 'Idle timeout (mins; 0 to disable):', 'idle timeout not set' => 'Idle timeout not set.', 'ids add provider' => 'Add provider', +'ids adjust ruleset' => 'Adjust rules and add user defined customizations...', 'ids apply' => 'Apply', 'ids apply ruleset changes' => 'The ruleset changes are being applied. Please wait until all operations have completed successfully...', 'ids automatic rules update' => 'Automatic Rule Update', 'ids autoupdates' => 'Automatic updates', +'ids cleanup tmp dir' => 'Cleanup temporary directory...', 'ids could not add provider' => 'Could not add provider', 'ids customize ruleset' => 'Customize ruleset', 'ids download new ruleset' => 'Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...', 'ids enable' => 'Enable Intrusion Prevention System', 'ids enable automatic updates' => 'Enable automatic updates', +'ids extract ruleset' => 'Extracting ruleset for provider:', +'ids finished' => 'Finished...', 'ids force ruleset update' => 'Force ruleset update', 'ids hide' => 'Hide', 'ids ignored hosts' => 'Whitelisted Hosts', 'ids log hits' => 'Total of number of activated rules for', 'ids log viewer' => 'IPS Log Viewer', 'ids logs' => 'IPS Logs', +'ids merge classifications' => 'Merging classifications...', +'ids merge sid files' => 'Merging sid to message files...', 'ids monitor traffic only' => 'Monitor traffic only', 'ids monitored interfaces' => 'Monitored Interfaces', 'ids no enabled ruleset provider' => 'No enabled ruleset is available. Please activate or add one first.', 'ids no network zone' => 'Please select at least one network zone to be monitored', 'ids provider' => 'Provider', 'ids provider settings' => 'Provider settings', +'ids remove rule structures' => 'Remove old rule structures...', '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...', -- 2.39.2