From patchwork Thu Mar 21 20:51:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7657 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4V0yLc0SCZz3wkd for ; Thu, 21 Mar 2024 20:51:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4V0yLJ0YG1zFLY; Thu, 21 Mar 2024 20:51:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4V0yLH44kSz32v4; Thu, 21 Mar 2024 20:51:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4V0yLB2bwxz32v2 for ; Thu, 21 Mar 2024 20:51:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4V0yL94b6Zznn; Thu, 21 Mar 2024 20:51:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1711054290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JBPrfEPRrh6uwu0L7aI2ONrYjDzkr2qT+CSAdj8CLhU=; b=O5QOA6YBQIylq1kzOron6Hymj+1tRFppVoZtMuB4M9BDgKvETiEkN2UlJIEJyBzxmE/0eA sxwwsI7GYmlJCWAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1711054290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JBPrfEPRrh6uwu0L7aI2ONrYjDzkr2qT+CSAdj8CLhU=; b=XtLqqPh98nu65skRIalE+Js9abKP/qG69Xj/oE3sZ+hd549jXq0fuW6dJNQzG1BsHHquUy B6CDCy7PRxDGvPR8iINdYv6DrdiWykWxJrB+G5wBM3pf8mosVvmibmv2kSZ/m0zJC3lJf+ ZVsnAj5n9g0M5lmS7XRl2c/mnPLuYozul7PmSGhDvDYyYO79rGXXULcrtTmDdPTAMNRgV+ hsOZ6feva9k6+nZkDVXPUEM1+rldHq9eDXZHhjwpod8+n1lboJZmSP/l+DamwzMrFzJE8g kEoDd8Rhurqgs9qAguIiLatNUhF2j0MT5YJ8m4qznWpo6PZZ+qC/etGRIuBGEA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 5/5] ids.cgi: Adjust code for marking unsupported providers Date: Thu, 21 Mar 2024 21:51:18 +0100 Message-Id: <20240321205118.382948-5-stefan.schantl@ipfire.org> In-Reply-To: <20240321205118.382948-1-stefan.schantl@ipfire.org> References: <20240321205118.382948-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: J2DTLAJHDBE4BZKEMESYAH3DRZ3PXHUE X-Message-ID-Hash: J2DTLAJHDBE4BZKEMESYAH3DRZ3PXHUE X-MailFrom: stefan.schantl@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Stefan Schantl --- html/cgi-bin/ids.cgi | 28 +++++++++++++++++----------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index e29482fa8..2d4ac6fc3 100644 --- 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 = "*"; } # Choose icons for the checkboxes. @@ -1202,7 +1203,7 @@ END print < - $provider_name + $provider_name$unsupported $rulesetdate @@ -1258,10 +1259,15 @@ print <
-
- - - +
+ + + - -
+END + print "* $Lang::tr{'ids unsupported provider'}\n"; +print < +
END # Only show this button if a ruleset provider is configured. @@ -1270,10 +1276,10 @@ END } print < -
-
+ + + + END &Header::closebox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f13bddf4b..b7b86fc7f 100644 --- 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 0113f8811..8e50aba76 100644 --- 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',