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 1d4c3928c1b9393ce8e0a1854d0ffe345502ba39..a16d4fa0dbe15bf44a009c991360dc4a9c8a3bfc 100644 (file)
--- 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 148c4323b44c013833dae101f9db7e1b7231993f..62a3ee380544e0ed9ef27fc693033baeebeb40b2 100644 (file)
--- 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 975b3f58d406d88b6a9abc41fb608eb2c54e5fab..0c6ebc881d6f1517ffd0a647c0d336a324d44719 100644 (file)
--- 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',