ids.cgi: Adjust code for marking unsupported providers

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index e29482fa86387a8676e140f01517de1d19c8202e..2d4ac6fc3e3c9d1131be07d158302c9184ca0400 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -1162,6 +1162,7 @@ END
                                my $subscription_code = $used_providers{$id}[1];
                                my $autoupdate_status = $used_providers{$id}[2];
                                my $status  = $used_providers{$id}[3];
+                               my $unsupported;
 
                                # Check if the item number is even or not.
                                if ($line % 2) {
@@ -1172,8 +1173,8 @@ END
 
                                # Handle providers which are not longer supported.
                                unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) {
-                                       # Assign background color
-                                       $col="bgcolor='#FF4D4D'";
+                                       # Mark this provider as unsupported.
+                                       $unsupported = "<img src='/blob.gif' alt='*'>";
                                }
 
                                # Choose icons for the checkboxes.
@@ -1202,7 +1203,7 @@ END
 
 print <<END;
                                <tr>
-                                       <td width='33%' class='base' $col>$provider_name</td>
+                                       <td width='33%' class='base' $col>$provider_name$unsupported</td>
                                        <td width='30%' class='base' $col>$rulesetdate</td>
 
                                        <td align='center' $col>
@@ -1258,10 +1259,15 @@ print <<END;
        <hr>
        <br>
 
-       <div align='right'>
-               <table width='100%'>
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <tr>
+       <table width='100%'>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <tr>
+                               <td>
+END
+                                       print "<img src='/blob.gif' alt='*'> $Lang::tr{'ids unsupported provider'}\n";
+print <<END;
+                               </td>
+                               <td><div align='right'>
 END
 
                                        # Only show this button if a ruleset provider is configured.
@@ -1270,10 +1276,10 @@ END
                                        }
 print <<END;
                                        <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
-                               </tr>
-                       </form>
-               </table>
-       </div>
+                                       </div></td>
+                       </tr>
+               </form>
+       </table>
 END
 
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index f13bddf4bce6a02e21f2cc8adf1c0c5a6495adff..b7b86fc7fc8938928225082f6f381c6e95dcf0f6 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1416,6 +1416,7 @@
 'ids show' => 'Anzeigen',
 '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',
 'ids visit provider website' => 'Anbieter-Webseite besuchen',
 'ids working' => 'Änderungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.',
 'iface' => 'Iface',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 0113f8811fa2c58dfad95a04cc25033d3b5aeecb..8e50aba76751b91d66b86c03aa1a50a9cd619629 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1467,6 +1467,7 @@
 'ids subscription code required' => 'The selected ruleset requires a subscription code',
 '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',
 'ids visit provider website' => 'Visit provider website',
 'ids working' => 'Changes are being applied. Please wait until all operations have completed successfully...',
 'iface' => 'Iface',