| Message ID | 20250528064223.1975817-1-stephen@firemypi.org |
|---|---|
| State | Staged |
| Commit | 1a89896a79d0060e08df287f9c4536dba12927d3 |
| Headers |
Return-Path: <development+bounces-515-patchwork=ipfire.org@lists.ipfire.org> 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4b6g0z4ykQz3wmb for <patchwork@web04.haj.ipfire.org>; Wed, 28 May 2025 06:42:43 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4b6g0z06CXz6Wk for <patchwork@ipfire.org>; Wed, 28 May 2025 06:42:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4b6g0y6VZNz334H for <patchwork@ipfire.org>; Wed, 28 May 2025 06:42:42 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4b6g0w02Zfz2xZm for <development@lists.ipfire.org>; Wed, 28 May 2025 06:42:39 +0000 (UTC) Received: from resdmta-h2p-564583.sys.comcast.net (resdmta-h2p-564583.sys.comcast.net [IPv6:2001:558:fd02:2446::d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4b6g0s1dZ0zCx for <development@lists.ipfire.org>; Wed, 28 May 2025 06:42:37 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=SVe4Bwew; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd02:2446::d) smtp.mailfrom=stephen@firemypi.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1748414558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=qQgZwN0GykabvL9xI2tQkJbmsYRuiPhgdGJOo/hobSk=; b=WBnhKeYOB4i6pQlf9ZhTORruvxl5dSRug3JGTNFQqu0MvvRkpe7zW+xEj0IqPXbIpnCSz9 LX4lwU69/FHPD14D5/jBQKj5ihjVvWd0Y6jjp9z9oKsxgUz5qc+CFF9mISe+7qnBSfmkQB UdiZ8Xfzh3IBTLQRI/XoEVz7WdmmAR8qjiLQLIXBI/FjzvglQEXU281YYIaqie26kCq1Cb 9PfCaNANKW2i9KistM0sLAor2AAzGDyzRYlzcqoRwXOaEcm7upBndPWCspn91hK2VFyhNv DTsynCMmDprTo5yr14r6YRvjcxp3SH33+XUrcSi5GnQsC8j7rMJ3Lci9EUuoPw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=SVe4Bwew; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd02:2446::d) smtp.mailfrom=stephen@firemypi.org; dmarc=none ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1748414558; a=rsa-sha256; cv=none; b=Nm1JyI8mTbNj5b4+XXTzCxF470YuoWzkjvUpTXNBTDZrOUrDifhwWhDuyA9K3FPnzaDyog 4+Jo7rTTRwNrmt0xg9gpflXytR0PpoMDWFw/wwsiLSCXh3s71jOaikMSIsFxl7WrjWGz+H dllCa/kkpcJN2pq+YEItPdJHBoeTU53Fc7Ip4Ib+ZnJmxSWdy4Wj8rkVUwUFJNMZq2XzxV GF1p9+vqKopB2QrgRrRjGiRfpJk930GbDt4qWtSjMOL5j75cS7YvRkfX0WQRKzC7TGhWUb QpdskKRGWNyXEZ1tmK2IQofSEzppnFBhA8WpbTRpEOPhMFr6/Mdonp5/bo7KIg== Received: from resomta-h2p-555030.sys.comcast.net ([96.102.179.204]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resdmta-h2p-564583.sys.comcast.net with ESMTPS id KASZuC01OBQiCKAUfuNOD6; Wed, 28 May 2025 06:42:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcastmailservice.net; s=20211018a; t=1748414549; bh=qQgZwN0GykabvL9xI2tQkJbmsYRuiPhgdGJOo/hobSk=; h=Received:Received:From:To:Subject:Date:Message-ID:MIME-Version: Xfinity-Spam-Result; b=SVe4BwewR6TTsWI67nJy3lGBZJzcodtCC4B741n5Rb4+Mpmv7Kjjqgw8yniuYqU2q w8v8ZvDZCP3ZdhAl/Sd+wMyLFy24Smtn3iOYopru0ISHLuQlJmBfwL6ggQjoS+9AnM vywikyf/CGNGmczrA9KB+7L9JdK8B+QF48uxiwHvX+L4fJ5N5D+FJUDg+qlsUw5pOL d7034/0N1dhwIGAQJsZc57Tgvollxsg9u98aDu1imcHVZ1QifacDbjrc3fzp/s3UMd UD1dN1ffVsY1KngKLb6f+rI4dTfWxbHandn8S3odILWAKddaOlx2ir8AZdu+zPOod/ eJtLXZZteOc6w== Received: from lambda.localdomain ([75.70.122.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-h2p-555030.sys.comcast.net with ESMTPSA id KAUcutFerzpaOKAUduCIjw; Wed, 28 May 2025 06:42:29 +0000 From: Stephen Cuka <stephen@firemypi.org> To: development@lists.ipfire.org Cc: Stephen Cuka <stephen@firemypi.org> Subject: [PATCH] header.pl: Fixbug13857 - Disable Blue Access submenu if no BLUE network Date: Wed, 28 May 2025 00:42:23 -0600 Message-ID: <20250528064223.1975817-1-stephen@firemypi.org> X-Mailer: git-send-email 2.43.0 Precedence: list List-Id: <development.lists.ipfire.org> List-Subscribe: <https://lists.ipfire.org/>, <mailto:development+subscribe@lists.ipfire.org?subject=subscribe> List-Unsubscribe: <https://lists.ipfire.org/>, <mailto:development+unsubscribe@lists.ipfire.org?subject=unsubscribe> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development+help@lists.ipfire.org?subject=help> Sender: <development@lists.ipfire.org> Mail-Followup-To: <development@lists.ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfMO5il6aP7zW/1Yomnq/uXLOncvZvcE6GocQWmGGLUmnoQWijKpprchbUVAm3f/JAENnWDhenwQHw0zzpuNFM5oxsbY+7hY8iMg3PmuYKPZIF25YZOxC /z+ODCIPKYXnyHbW+F8svdfEOs+PnCOc0ravFzqhr7nDbSgCrh7iuesNJe6EEhF/vwWORXtbwpUf/PggzXzs36EKBS2AS5UUxIEibVnHD2VPqDRZDG4o8M3T DolG93WMRpJdA3UlZRza/w== X-Rspamd-Action: no action X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4b6g0s1dZ0zCx X-Spamd-Result: default: False [0.01 / 11.00]; HFILTER_HELO_5(3.00)[resdmta-h2p-564583.sys.comcast.net]; BAYES_HAM(-2.95)[99.80%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; IP_REPUTATION_HAM(-0.23)[asn: 7922(-0.22), country: US(-0.01), ip: 2001:558:fd02:2446::(0.00)]; R_DKIM_ALLOW(-0.20)[comcastmailservice.net:s=20211018a]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[firemypi.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[75.70.122.243:received]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_REPUTATION(0.00)[0]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:7922, ipnet:2001:558::/29, country:US]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[comcastmailservice.net:+]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; R_SPF_NA(0.00)[no SPF record] |
| Series |
header.pl: Fixbug13857 - Disable Blue Access submenu if no BLUE network
|
|
Commit Message
Stephen Cuka
May 28, 2025, 6:42 a.m. UTC
- Fix reference to BlueAccess menu item so that it is disabled
when BLUE network is not in use.
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
---
config/cfgroot/header.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Hello Stephen, Good catch! This was broken since 2019. https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=820b2909825479b52696886d1f9054c0f709d3f0 -Michael > On 28 May 2025, at 07:42, Stephen Cuka <stephen@firemypi.org> wrote: > > - Fix reference to BlueAccess menu item so that it is disabled > when BLUE network is not in use. > > Signed-off-by: Stephen Cuka <stephen@firemypi.org> > --- > config/cfgroot/header.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl > index 2d4aa89f2..1eb7e3b9a 100644 > --- a/config/cfgroot/header.pl > +++ b/config/cfgroot/header.pl > @@ -456,7 +456,7 @@ sub genmenu { > eval `/bin/cat /var/ipfire/menu.d/*.main`; > > if (! blue_used()) { > - $menu->{'05.firewall'}{'subMenu'}->{'60.wireless'}{'enabled'} = 0; > + $menu->{'05.firewall'}{'subMenu'}->{'70.wireless'}{'enabled'} = 0; > } > if ( $Network::ethernet{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $Network::ethernet{'RED_TYPE'} eq 'STATIC' ) { > $menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} = 1; > -- > 2.43.0 > >
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 2d4aa89f2..1eb7e3b9a 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -456,7 +456,7 @@ sub genmenu { eval `/bin/cat /var/ipfire/menu.d/*.main`; if (! blue_used()) { - $menu->{'05.firewall'}{'subMenu'}->{'60.wireless'}{'enabled'} = 0; + $menu->{'05.firewall'}{'subMenu'}->{'70.wireless'}{'enabled'} = 0; } if ( $Network::ethernet{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $Network::ethernet{'RED_TYPE'} eq 'STATIC' ) { $menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} = 1;