From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 16 Apr 2022 13:30:03 +0000 (+0200)
Subject: ids.cgi: Handle "Not modified" when forcing an ruleset update.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00271ed769a64e309498c8c5ab2267c0e5982957;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Handle "Not modified" when forcing an ruleset update.

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

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 1d4c3928c1..a16d4fa0db 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -436,8 +436,16 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 		&working_notice("$Lang::tr{'ids download new ruleset'}");
 
 		# Call subfunction to download the ruleset.
-		if(&IDS::downloadruleset($provider)) {
-			$errormessage = "$provider - $Lang::tr{'could not download latest updates'}";
+		my $return = &IDS::downloadruleset($provider);
+
+		# Check if the download function gives a return code.
+		if ($return) {
+			# Handle different return codes.
+			if ($return eq "not modified") {
+				$errormessage = "$provider - $Lang::tr{'ids ruleset is up to date'}";
+			} else {
+				$errormessage = "$provider - $Lang::tr{'could not download latest updates'}: $return";
+			}
 
 			# Call function to store the errormessage.
 			&IDS::_store_error_message($errormessage);
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 148c4323b4..62a3ee3805 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1407,6 +1407,7 @@
 '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...',
+'ids ruleset is up to date' => 'Regelset ist aktuell - Keine Aktualisierung notwendig.',
 'ids ruleset settings' => 'Regelsatzeinstellungen',
 'ids show' => 'Anzeigen',
 'ids the choosen provider is already in use' => 'Der gewhählte Provider wird bereits verwendet.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 975b3f58d4..0c6ebc881d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1452,6 +1452,7 @@
 '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...',
+'ids ruleset is up to date' => 'No update required - The ruleset is up to date.',
 'ids ruleset settings' => 'Ruleset Settings',
 'ids show' => 'Show',
 'ids subscription code required' => 'The selected ruleset requires a subscription code',