From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 15/20] ids.cgi: Use new style tables for rulesets Date: Tue, 10 Sep 2024 14:37:28 +0000 Message-ID: <20240910143748.3469271-16-michael.tremer@ipfire.org> In-Reply-To: <20240910143748.3469271-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7352966300231882936==" List-Id: --===============7352966300231882936== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- doc/language_issues.de | 1 + doc/language_issues.en | 3 ++- doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 ++- doc/language_issues.nl | 3 ++- doc/language_issues.pl | 3 ++- doc/language_issues.ru | 3 ++- doc/language_issues.tr | 3 ++- doc/language_missings | 14 ++++++++++++++ html/cgi-bin/ids.cgi | 26 ++++++++------------------ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 13 files changed, 45 insertions(+), 24 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index b3d7082df..bd335de41 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -400,6 +400,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 ruleset settings WARNING: translation string unused: ids unsupported provider WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype diff --git a/doc/language_issues.en b/doc/language_issues.en index 3aa4e9bd8..5063749c4 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1070,7 +1070,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1217,6 +1217,7 @@ WARNING: untranslated string: lan =3D LAN WARNING: untranslated string: languagepurpose =3D Select the language you wi= sh IPFire to display in: WARNING: untranslated string: last =3D Last WARNING: untranslated string: last activity =3D Last Activity +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: lease expires =3D Lease expires WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: legend =3D Legend diff --git a/doc/language_issues.es b/doc/language_issues.es index fbbcd1e74..7e76d5dcf 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -444,6 +444,7 @@ WARNING: translation string unused: ids rules license1 WARNING: translation string unused: ids rules license2 WARNING: translation string unused: ids rules license3 WARNING: translation string unused: ids rules update +WARNING: translation string unused: ids ruleset settings WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity @@ -1028,8 +1029,10 @@ WARNING: untranslated string: hostile networks in =3D = >>From Hostile Networks WARNING: untranslated string: hostile networks out =3D To Hostile Networks WARNING: untranslated string: hostile networks total =3D Total Hostile Netwo= rks WARNING: untranslated string: ids provider eol =3D (EOL) +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: info messages =3D unknown string WARNING: untranslated string: invalid ip or hostname =3D Invalid IP Address = or Hostname +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: load average =3D Load Average WARNING: untranslated string: log drop hostile in =3D Log dropped packets FR= OM hostile networks WARNING: untranslated string: log drop hostile out =3D Log dropped packets T= O hostile networks diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 25193da6a..ab6eb0478 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -428,6 +428,7 @@ WARNING: translation string unused: id WARNING: translation string unused: ids automatic rules update WARNING: translation string unused: ids oinkcode required WARNING: translation string unused: ids rules update +WARNING: translation string unused: ids ruleset settings WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity @@ -981,6 +982,8 @@ WARNING: untranslated string: guardian no entries =3D unk= nown string WARNING: untranslated string: guardian service =3D unknown string WARNING: untranslated string: hostile networks total =3D Total Hostile Netwo= rks WARNING: untranslated string: ids provider eol =3D (EOL) +WARNING: untranslated string: ids rulesets =3D Rulesets +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: load average =3D Load Average WARNING: untranslated string: oops something went wrong =3D Oops, something = went wrong... WARNING: untranslated string: ovpn roadwarrior server =3D OpenVPN Roadwarrio= r Server diff --git a/doc/language_issues.it b/doc/language_issues.it index f00d959d5..ab6c95d68 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1132,7 +1132,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1185,6 +1185,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoin= t =3D Host-to-Net Endpoint WARNING: untranslated string: ipsec routing table entries =3D IPsec Routing = Table Entries WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: load average =3D Load Average WARNING: untranslated string: local ip address =3D Local IP Address diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9607f98af..7f6c04e23 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1138,7 +1138,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1193,6 +1193,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoin= t =3D Host-to-Net Endpoint WARNING: untranslated string: ipsec routing table entries =3D IPsec Routing = Table Entries WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: load average =3D Load Average WARNING: untranslated string: local ip address =3D Local IP Address diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 92ad3b7be..d073e30b1 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1276,7 +1276,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1338,6 +1338,7 @@ WARNING: untranslated string: ipsec routing table entri= es =3D IPsec Routing Table WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit WARNING: untranslated string: last =3D Last +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: lifetime =3D Lifetime: WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 35a590b6b..651f5266a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1271,7 +1271,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1334,6 +1334,7 @@ WARNING: untranslated string: ipsec routing table entri= es =3D IPsec Routing Table WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit WARNING: untranslated string: last =3D Last +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: lifetime =3D Lifetime: WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 3bf595efe..6c22f6d76 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1074,7 +1074,7 @@ WARNING: untranslated string: ids remove rule structure= s =3D Remove old rule struc WARNING: untranslated string: ids reset provider =3D Reset provider WARNING: untranslated string: ids ruleset autoupdate in progress =3D Ruleset= update in progress. Please wait until all operations have completed successf= ully... WARNING: untranslated string: ids ruleset is up to date =3D No update requir= ed - The ruleset is up to date. -WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings +WARNING: untranslated string: ids rulesets =3D Rulesets WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids subscription code required =3D The selecte= d ruleset requires a subscription code WARNING: untranslated string: ids the choosen provider is already in use =3D= The choosen provider is already in use. @@ -1122,6 +1122,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoin= t =3D Host-to-Net Endpoint WARNING: untranslated string: ipsec routing table entries =3D IPsec Routing = Table Entries WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit +WARNING: untranslated string: last updated =3D Last Updated WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: load average =3D Load Average WARNING: untranslated string: local ip address =3D Local IP Address diff --git a/doc/language_missings b/doc/language_missings index 94adb28d8..7e3357df0 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -137,8 +137,10 @@ < hostile networks out < hostile networks total < ids provider eol +< ids rulesets < ids unsupported provider < invalid ip or hostname +< last updated < load average < log drop hostile in < log drop hostile out @@ -177,7 +179,9 @@ < g.lite < hostile networks total < ids provider eol +< ids rulesets < ids unsupported provider +< last updated < load average < oops something went wrong < ovpn roadwarrior server @@ -447,6 +451,7 @@ < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date +< ids rulesets < ids ruleset settings < ids show < ids subscription code required @@ -507,6 +512,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< last updated < legacy architecture warning < link-layer encapsulation < load average @@ -988,6 +994,7 @@ < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date +< ids rulesets < ids ruleset settings < ids show < ids subscription code required @@ -1050,6 +1057,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< last updated < legacy architecture warning < link-layer encapsulation < load average @@ -1834,6 +1842,7 @@ < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date +< ids rulesets < ids ruleset settings < ids show < ids subscription code required @@ -1904,6 +1913,7 @@ < ipsec settings < itlb multihit < last +< last updated < least preferred < legacy architecture warning < lifetime @@ -2848,6 +2858,7 @@ < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date +< ids rulesets < ids ruleset settings < ids show < ids subscription code required @@ -2919,6 +2930,7 @@ < ipsec settings < itlb multihit < last +< last updated < least preferred < legacy architecture warning < lifetime @@ -3454,6 +3466,7 @@ < ids reset provider < ids ruleset autoupdate in progress < ids ruleset is up to date +< ids rulesets < ids ruleset settings < ids show < ids subscription code required @@ -3509,6 +3522,7 @@ < ipsec routing table entries < ipsec settings < itlb multihit +< last updated < legacy architecture warning < link-layer encapsulation < load average diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index deebb3ad3..737826580 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -1103,16 +1103,15 @@ END # # Used Ruleset Providers section. # - &Header::openbox('100%', 'center', $Lang::tr{'ids ruleset settings'}); + &Header::openbox('100%', 'center', $Lang::tr{'ids rulesets'}); =20 print < + - - - - - + END my $line =3D 1; @@ -1133,13 +1132,6 @@ END my $status =3D $used_providers{$id}[3]; my $unsupported; =20 - # Check if the item number is even or not. - if ($line % 2) { - $col=3D"bgcolor=3D'$color{'color22'}'"; - } else { - $col=3D"bgcolor=3D'$color{'color20'}'"; - } - # Handle providers which are not longer supported. unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) { $col =3D "bgcolor=3D'$Header::colouryellow'"; @@ -1172,8 +1164,8 @@ END =20 print < - - + + =20
$Lang::tr{'ids provid= er'}$Lang::tr{'date'}= $Lan= g::tr{'ids autoupdates'}$Lan= g::tr{'action'}$Lang::tr{'ids provider'} + $Lang::tr{'last updated'} + $Lang::tr{'ids autoupdates'} + $Lang::tr{'action'}
$provider_name $unsupported$rulesetdate$provider_name $unsupported$rulesetdate
@@ -1225,8 +1217,6 @@ END # Section to add new elements or edit existing ones. print < -
-
=20
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a718228bc..b06ba6e91 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1413,6 +1413,7 @@ 'ids ruleset autoupdate in progress' =3D> 'Der Regelsatz wird gerade aktuali= siert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', 'ids ruleset is up to date' =3D> 'Regelset ist aktuell - Keine Aktualisierun= g notwendig.', 'ids ruleset settings' =3D> 'Regelsatzeinstellungen', +'ids rulesets' =3D> 'Regels=C3=A4tze', 'ids show' =3D> 'Anzeigen', 'ids the choosen provider is already in use' =3D> 'Der gewh=C3=A4hlte Provid= er wird bereits verwendet.', 'ids unable to download the ruleset' =3D> 'Das Regelset konnte nicht herunte= rgeladen werden.', @@ -1603,6 +1604,7 @@ 'languagepurpose' =3D> 'W=C3=A4hlen Sie eine Sprache, in der IPFire angezeig= t werden soll:', 'last' =3D> 'Letzte', 'last activity' =3D> 'Letzte Aktivit=C3=A4t', +'last updated' =3D> 'Zuletzt Aktualisiert', 'lateprompting' =3D> 'Late prompting', 'lease expires' =3D> 'Zuordnung verf=C3=A4llt', 'least preferred' =3D> 'weniger pr=C3=A4feriert', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6a455ab6d..59da23c3a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1466,6 +1466,7 @@ 'ids ruleset autoupdate in progress' =3D> 'Ruleset update in progress. Pleas= e wait until all operations have completed successfully...', 'ids ruleset is up to date' =3D> 'No update required - The ruleset is up to = date.', 'ids ruleset settings' =3D> 'Ruleset Settings', +'ids rulesets' =3D> 'Rulesets', 'ids show' =3D> 'Show', 'ids subscription code required' =3D> 'The selected ruleset requires a subsc= ription code', 'ids the choosen provider is already in use' =3D> 'The choosen provider is a= lready in use.', @@ -1660,6 +1661,7 @@ 'languagepurpose' =3D> 'Select the language you wish IPFire to display in:', 'last' =3D> 'Last', 'last activity' =3D> 'Last Activity', +'last updated' =3D> 'Last Updated', 'lateprompting' =3D> 'Lateprompting', 'lease expires' =3D> 'Lease expires', 'least preferred' =3D> 'least preferred', --=20 2.39.2 --===============7352966300231882936==--