From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 7 Feb 2019 07:51:31 +0000 (+0100)
Subject: ids.cgi: Improve showed messages while the IDS is working
X-Git-Tag: v2.23-core131~117^2~54
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5bd8940d68186e1ad2cbbb376c4bae6d512630bb

ids.cgi: Improve showed messages while the IDS is working

Reference #11993

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 82d79a369b..54db48b7d0 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -241,9 +241,9 @@ if (-e $IDS::storederrorfile) {
         unlink($IDS::storederrorfile);
 }
 
-## Grab all available snort rules and store them in the idsrules hash.
+## Grab all available rules and store them in the idsrules hash.
 #
-# Open snort rules directory and do a directory listing.
+# Open rules directory and do a directory listing.
 opendir(DIR, $IDS::rulespath) or die $!;
 	# Loop through the direcory.
 	while (my $file = readdir(DIR)) {
@@ -368,7 +368,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 			unless ($errormessage) {
 				# Lock the webpage and print notice about downloading
 				# a new ruleset.
-				&working_notice("$Lang::tr{'snort working'}");
+				&working_notice("$Lang::tr{'ids working'}");
 
 				# Call subfunction to download the ruleset.
 				if(&IDS::downloadruleset()) {
@@ -497,7 +497,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 	&IDS::write_used_rulefiles_file(@enabled_rulefiles);
 
 	# Lock the webpage and print message.
-	&working_notice("$Lang::tr{'snort working'}");
+	&working_notice("$Lang::tr{'ids apply ruleset changes'}");
 
 	# Call oinkmaster to alter the ruleset.
 	&IDS::oinkmaster();
@@ -527,7 +527,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 	unless ($errormessage) {
 		# Lock the webpage and print notice about downloading
 		# a new ruleset.
-		&working_notice("$Lang::tr{'snort working'}");
+		&working_notice("$Lang::tr{'ids download new ruleset'}");
 
 		# Call subfunction to download the ruleset.
 		if(&IDS::downloadruleset()) {
@@ -552,7 +552,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 			&reload();
 		}
 	}
-# Save snort settings.
+# Save IDS settings.
 } elsif ($cgiparams{'IDS'} eq $Lang::tr{'save'}) {
 	my %oldidssettings;
 	my $reload_page;
@@ -617,7 +617,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 		# Check if a ruleset exists.
 		if (%idsrules) {
 			# Lock the webpage and print message.
-			&working_notice("$Lang::tr{'snort working'}");
+			&working_notice("$Lang::tr{'ids working'}");
 
 			# Call oinkmaster to alter the ruleset.
 			&IDS::oinkmaster();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index f73c159db1..edf0a078c2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1326,10 +1326,12 @@
 'idle' => 'Leerlauf',
 'idle timeout' => 'Leerlauf-Wartezeit in Min. (0 zum Deaktivieren):',
 'idle timeout not set' => 'Leerlauf-Wartezeit nicht angegeben.',
+'ids apply ruleset changes' => 'Regel-Änderungen werden übernommen ... Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.',
 'ids automatic rules update' => 'Automatische Regeln-Aktualisierung',
 'ids traffic analyze' => 'Packet-Analyse',
 'ids active on' => 'Aktiv auf',
 'ids enable' => 'Intrusion-Prevention-System aktivieren',
+'ids download new ruleset' => 'Das neue Regelset wird heruntergeladen und entpackt ... Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.',
 'ids log viewer' => 'Ansicht IPS-Protokoll',
 'ids logs' => 'IPS-Protokolldateien',
 'ids monitored interfaces' => 'Überwachte Netzwerkzonen',
@@ -1345,6 +1347,7 @@
 'ids rules license3' => 'klicken Sie den "Generate code"-Knopf und kopieren Sie den 40-Zeichen Oinkcode in das untere Feld.',
 'ids rules update' => 'IPS-Regeln',
 'ids ruleset autoupdate in progress' => 'Das Regelset wird gerade aktualisiert ... Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.',
+'ids working' => 'Änderungen werden übernommen ... Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.',
 'iface' => 'Iface',
 'ignore filter' => '&quot;Ignorieren&quot;-Filter',
 'ike encryption' => 'IKE Verschlüsselung:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index adfe2350af..5218bc34e3 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1357,9 +1357,11 @@
 'idle' => 'Idle',
 'idle timeout' => 'Idle timeout (mins; 0 to disable):',
 'idle timeout not set' => 'Idle timeout not set.',
+'ids apply ruleset changes' => 'The ruleset changes will be applied ... Please wait until all operations have completed successfully.',
 'ids automatic rules update' => 'Automatic rules update',
 'ids traffic analyze' => 'Traffic analyzing',
 'ids active on' => 'Active on',
+'ids download new ruleset' => 'Downloading and unpacking new ruleset ... Please wait until all operations have completed successfully.',
 'ids enable' => 'Enable Intrusion Prevention System',
 'ids hide' => 'Hide',
 'ids log viewer' => 'IPS log viewer',
@@ -1378,6 +1380,7 @@
 'ids rules update' => 'IPS rules',
 'ids ruleset autoupdate in progress' => 'Ruleset update in progress ... Please wait until all operations have completed successfully.',
 'ids show' => 'Show',
+'ids working' => 'Changes will be applied ... Please wait until all operations have completed successfully.',
 'iface' => 'Iface',
 'ignore filter' => 'Ignore filter',
 'ike encryption' => 'IKE Encryption:',