From patchwork Tue Nov 17 06:29:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo-Andres Hofmann X-Patchwork-Id: 3665 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CZwyW2bp2z3wlJ for ; Tue, 17 Nov 2020 06:29:23 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CZwyS00Klz1k7; Tue, 17 Nov 2020 06:29:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CZwyR6N3Kz2ygN; Tue, 17 Nov 2020 06:29:19 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CZwyQ4zMnz2xlV for ; Tue, 17 Nov 2020 06:29:18 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4CZwyN4Qzmzj7 for ; Tue, 17 Nov 2020 06:29:16 +0000 (UTC) Received: (qmail 10993 invoked from network); 17 Nov 2020 06:29:15 -0000 Received: from localhost (HELO localhost) (127.0.0.1) by arche.uberspace.de with SMTP; 17 Nov 2020 06:29:15 -0000 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 1/4] zoneconf.cgi: Clean up HTML output Date: Tue, 17 Nov 2020 07:29:01 +0100 Message-Id: <20201117062904.1547-1-hofmann@leo-andres.de> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1605594556; a=rsa-sha256; cv=none; b=aZ04YSB8GWIGOxfyUN9soYIIHOeVml/OtYL07vHF+ToyDrEKCLvkuOXpIahq3raq02fGJy F++QoGl8JhPg0sSZwD7xghiNV5CqRhM6JYpwk4LhcBJAfA0oiz7U+rslpK1BRB7mDim+iC cHfT9vDTrhK8s90kujdL8bYhCFjaiknb3PCbwbDjRndkayEkToiOwN+jHbzsA76PH4TBCF bjPUtVcaWevO7GCwyZ9i+3/J6wKxF+VU+Ue8O9BVsqozZrXpnizhL/FJ28gzlzpZAZF4zn SEg7aQeMj/zqmLwHpY9chobAiR7lgKYPKdduHTYhbJ1xABatrO1jaZshhyGlCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1605594556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PuEeBYJtYvXrp3GiKc1ch9t155kxYwmD4LCmn1Vot/0=; b=iOYu5aNg+6ZN5/cbcv9EicLRTT/5QGBiEAgNhDoZxrKEzRr13VtW4Opz3peIDXsIMtQ6j1 9EG8sQKNJQhPZrLiFldjGYlSqz69ILqo+mdiCpxb3UwVWM4bJ3A0fLDSNfHUIAYOG4Pkfd fZZaqrRX+BNgOkoN9lM75W8wPxodARnVlLPtN1coUH92m+UqbAA4iOfRhiPBcEAYl/8J+D Int6HJK/xsQaTjfV8CAtTaGGH/cg7dq0Brs+0+hnkEU1HPl9x2NTCdcmlA2Y8UjwbrTBz6 vEp5gLpWLZZkMW4n+1QLx0tdgQAD9WSvMmp8F20KsufkKfSy4+vfu5mfy1dNMw== X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [0.69 / 11.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; IP_REPUTATION_HAM(-0.01)[asn: 205766(0.00), country: DE(-0.00), ip: 185.26.156.147(0.00)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+mx]; DMARC_NA(0.00)[leo-andres.de]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-3.00)[99.99%] X-Rspamd-Queue-Id: 4CZwyN4Qzmzj7 Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This adds missing brackets, cleans up the indentation and removes unnecessary CSS. Signed-off-by: Leo-Andres Hofmann Reviewed-by: Michael Tremer --- html/cgi-bin/zoneconf.cgi | 46 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index d99a3e611..067410582 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -38,10 +38,6 @@ my $css = < - - + END ; @@ -332,7 +324,7 @@ foreach (@zones) { my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); if ($red_restricted) { - print ""; + print "\t\t\n"; next; # We're done here } @@ -350,7 +342,7 @@ foreach (@zones) { } print <$uc
+ "; +print "\t\n"; my $slightlygrey = ""; @@ -370,7 +362,8 @@ foreach (@nics) { my $nic = $_->[1]; my $wlan = $_->[2]; - print ""; + print "\t\n"; + print "\t\t\n"; # Iterate through all zones and check if the current NIC is assigned to it foreach (@zones) { @@ -393,7 +386,12 @@ foreach (@nics) { $checked = "checked"; } - print ""; + print < + + +END +; next; # We're done here } } @@ -432,19 +430,19 @@ foreach (@nics) { my $vlan_disabled = ($wlan) ? "disabled" : ""; print < - - - + END ; } - print ""; + print "\t\n"; if ($slightlygrey) { $slightlygrey = "";
+
$uc ($red_type)$uc ($red_type)$uc
$nic
$mac
$nic
$mac		 + + +