IPS: Fix how we show EOL providers
There is no need to add a legend as I find it confusing. The change that people are using an EOL is rather slim and so I don't to waste space. Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
parent
c2df627c8c
commit
9dd2a4635f
|
@ -384,6 +384,7 @@ WARNING: translation string unused: icmp type
|
|||
WARNING: translation string unused: id
|
||||
WARNING: translation string unused: ids oinkcode required
|
||||
WARNING: translation string unused: ids rules update
|
||||
WARNING: translation string unused: ids unsupported provider
|
||||
WARNING: translation string unused: ike encryption
|
||||
WARNING: translation string unused: ike grouptype
|
||||
WARNING: translation string unused: ike integrity
|
||||
|
@ -927,6 +928,7 @@ WARNING: untranslated string: guardian service = unknown string
|
|||
WARNING: untranslated string: hostile networks in = From Hostile Networks
|
||||
WARNING: untranslated string: hostile networks out = To Hostile Networks
|
||||
WARNING: untranslated string: hostile networks total = Total Hostile Networks
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
|
||||
WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
|
||||
WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
|
||||
|
|
|
@ -1079,6 +1079,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -993,6 +993,7 @@ WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilitie
|
|||
WARNING: untranslated string: hostile networks in = From Hostile Networks
|
||||
WARNING: untranslated string: hostile networks out = To Hostile Networks
|
||||
WARNING: untranslated string: hostile networks total = Total Hostile Networks
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: info messages = unknown string
|
||||
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
|
||||
WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
|
||||
|
|
|
@ -944,6 +944,7 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
|
|||
WARNING: untranslated string: guardian no entries = unknown string
|
||||
WARNING: untranslated string: guardian service = unknown string
|
||||
WARNING: untranslated string: hostile networks total = Total Hostile Networks
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: pakfire ago = ago.
|
||||
WARNING: untranslated string: routing config added = unknown string
|
||||
WARNING: untranslated string: routing config changed = unknown string
|
||||
|
|
|
@ -1095,6 +1095,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -1100,6 +1100,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -1240,6 +1240,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -1237,6 +1237,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -1037,6 +1037,7 @@ WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
|
|||
WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
|
||||
WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
|
||||
WARNING: untranslated string: ids provider = Provider
|
||||
WARNING: untranslated string: ids provider eol = (EOL)
|
||||
WARNING: untranslated string: ids provider settings = Provider settings
|
||||
WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
|
||||
WARNING: untranslated string: ids reset provider = Reset provider
|
||||
|
|
|
@ -62,6 +62,7 @@
|
|||
< hostile networks out
|
||||
< hostile networks total
|
||||
< ids automatic rules update
|
||||
< ids provider eol
|
||||
< ids subscription code required
|
||||
< insert removable device
|
||||
< invalid input for subscription code
|
||||
|
@ -123,6 +124,8 @@
|
|||
< hostile networks in
|
||||
< hostile networks out
|
||||
< hostile networks total
|
||||
< ids provider eol
|
||||
< ids unsupported provider
|
||||
< invalid ip or hostname
|
||||
< log drop hostile in
|
||||
< log drop hostile out
|
||||
|
@ -148,6 +151,8 @@
|
|||
< g.dtm
|
||||
< g.lite
|
||||
< hostile networks total
|
||||
< ids provider eol
|
||||
< ids unsupported provider
|
||||
< system time
|
||||
< timeformat
|
||||
< upload fcdsl.o
|
||||
|
@ -398,6 +403,7 @@
|
|||
< ids no enabled ruleset provider
|
||||
< ids no network zone
|
||||
< ids provider
|
||||
< ids provider eol
|
||||
< ids provider settings
|
||||
< ids remove rule structures
|
||||
< ids reset provider
|
||||
|
@ -408,6 +414,7 @@
|
|||
< ids subscription code required
|
||||
< ids the choosen provider is already in use
|
||||
< ids unable to download the ruleset
|
||||
< ids unsupported provider
|
||||
< ids visit provider website
|
||||
< ids working
|
||||
< incoming compression in bytes per second
|
||||
|
@ -924,6 +931,7 @@
|
|||
< ids no enabled ruleset provider
|
||||
< ids no network zone
|
||||
< ids provider
|
||||
< ids provider eol
|
||||
< ids provider settings
|
||||
< ids remove rule structures
|
||||
< ids reset provider
|
||||
|
@ -934,6 +942,7 @@
|
|||
< ids subscription code required
|
||||
< ids the choosen provider is already in use
|
||||
< ids unable to download the ruleset
|
||||
< ids unsupported provider
|
||||
< ids visit provider website
|
||||
< ids working
|
||||
< imei
|
||||
|
@ -1755,6 +1764,7 @@
|
|||
< ids no enabled ruleset provider
|
||||
< ids no network zone
|
||||
< ids provider
|
||||
< ids provider eol
|
||||
< ids provider settings
|
||||
< ids remove rule structures
|
||||
< ids reset provider
|
||||
|
@ -1765,6 +1775,7 @@
|
|||
< ids subscription code required
|
||||
< ids the choosen provider is already in use
|
||||
< ids unable to download the ruleset
|
||||
< ids unsupported provider
|
||||
< ids visit provider website
|
||||
< ids working
|
||||
< imei
|
||||
|
@ -2754,6 +2765,7 @@
|
|||
< ids no enabled ruleset provider
|
||||
< ids no network zone
|
||||
< ids provider
|
||||
< ids provider eol
|
||||
< ids provider settings
|
||||
< ids remove rule structures
|
||||
< ids reset provider
|
||||
|
@ -2764,6 +2776,7 @@
|
|||
< ids subscription code required
|
||||
< ids the choosen provider is already in use
|
||||
< ids unable to download the ruleset
|
||||
< ids unsupported provider
|
||||
< ids visit provider website
|
||||
< ids working
|
||||
< imei
|
||||
|
@ -3345,6 +3358,7 @@
|
|||
< ids no enabled ruleset provider
|
||||
< ids no network zone
|
||||
< ids provider
|
||||
< ids provider eol
|
||||
< ids provider settings
|
||||
< ids remove rule structures
|
||||
< ids reset provider
|
||||
|
@ -3355,6 +3369,7 @@
|
|||
< ids subscription code required
|
||||
< ids the choosen provider is already in use
|
||||
< ids unable to download the ruleset
|
||||
< ids unsupported provider
|
||||
< ids visit provider website
|
||||
< ids working
|
||||
< inodes
|
||||
|
|
|
@ -1173,8 +1173,8 @@ END
|
|||
|
||||
# Handle providers which are not longer supported.
|
||||
unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) {
|
||||
# Mark this provider as unsupported.
|
||||
$unsupported = "<img src='/blob.gif' alt='*'>";
|
||||
$col = "bgcolor='$Header::colouryellow'";
|
||||
$unsupported = $Lang::tr{'ids provider eol'};
|
||||
}
|
||||
|
||||
# Choose icons for the checkboxes.
|
||||
|
@ -1203,7 +1203,7 @@ END
|
|||
|
||||
print <<END;
|
||||
<tr>
|
||||
<td width='33%' class='base' $col>$provider_name$unsupported</td>
|
||||
<td width='33%' class='base' $col>$provider_name $unsupported</td>
|
||||
<td width='30%' class='base' $col>$rulesetdate</td>
|
||||
|
||||
<td align='center' $col>
|
||||
|
@ -1254,32 +1254,24 @@ END
|
|||
print "</table>\n";
|
||||
|
||||
# Section to add new elements or edit existing ones.
|
||||
print <<END;
|
||||
print <<END;
|
||||
<br>
|
||||
<hr>
|
||||
<br>
|
||||
|
||||
<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'>
|
||||
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||
<div align='right'>
|
||||
END
|
||||
|
||||
# Only show this button if a ruleset provider is configured.
|
||||
if (%used_providers) {
|
||||
print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n";
|
||||
}
|
||||
# Only show this button if a ruleset provider is configured.
|
||||
if (%used_providers) {
|
||||
print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n";
|
||||
}
|
||||
|
||||
print <<END;
|
||||
<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
|
||||
</div></td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
|
||||
</div>
|
||||
</form>
|
||||
END
|
||||
|
||||
&Header::closebox();
|
||||
|
|
|
@ -1456,6 +1456,7 @@
|
|||
'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 eol' => '(EOL)',
|
||||
'ids provider settings' => 'Provider settings',
|
||||
'ids remove rule structures' => 'Remove old rule structures...',
|
||||
'ids reset provider' => 'Reset provider',
|
||||
|
|
Loading…
Reference in New Issue