From patchwork Tue Sep 3 20:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2388 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 46NJrX071Vz4252 for ; Tue, 3 Sep 2019 20:46:03 +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 46NJrR4rKHz3pF; Tue, 3 Sep 2019 20:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543561; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=LgHWEdEhg70EiQ7+eog0wKW0MbyrOQ504YVtt2XvkgzkYi7V44HCD+BwjHwLFXpuLXy+C1 HbZRgcPP+7qyhEYxLDrKP4aFVYU0ln/phRiMP2lmnJliB83dzXRg81vQzMmdrfT9mePI9l HOf4qPw83dpxNzoyO1aNSIKSDqssmFlxS2bbplVUJR1azEyIcxQ5F3lxeXigsEVAwAH7Nn LOBKMRnoeCK0ZGMAhy31MWcfo6TyQV6DOkzcCInHM1oZOxnlCWAjdpAGSvAy56QWUUf7tQ QugdpI4ikwapSk87emezhi7us8/ZZdlJ6diWyzVKcxwk42pARxJnFLuGBt2Xbw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543561; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=K4Uq9te8Yy40EqULSOF10m/WuFwx+CGnHPaMjjo0EA2/30IyDH//87ne4bWzgFHJ9pCByP LLRON+0WbGTSdMDg== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrR2BCYz2ycq; Tue, 3 Sep 2019 20:45:59 +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 46NJrP04hxz2ycq for ; Tue, 3 Sep 2019 20:45:56 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (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 did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrN3FR9z3nD; Tue, 3 Sep 2019 20:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=X9QYNLG1JOwgBosNFEi5jb8KGk2FJhzPkdPYOkDeYeS+PHE1vL3DYB/EnDnb5JBytgyV70 DDs2bNJMz6rfLD0yASAMdPRnJPiKf300wcBdkh+39AqPZ4+JSEGMpoLgeM5rBUm3DMQYBA DyiWLe9G4hp+/Hkn+mpxz8H6uuIWaBU51LD1AdEp/c5+rdnNTlU0FDO3n0kW9WI7XMe/MZ do69Jl4z+oadSTMlMbXY2BtRuVG2SPww1CPYk5+J2OU/tEcugXki7+pNDRnd0GUdWM3iy8 J2xtcEuOR07NhI7O1H60YUv2brawbGMr8EUvydqFwBs8J7ETynAC+FFbg3iG8g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=q6QHT2A2hsD4Ldv09t8RyH8GOaHrzd4dMR9ZgrjxRpkujZkDOw1cYR5j+PMeyjate2J12c wJsIdtxOxNue1cDQ== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI Date: Tue, 3 Sep 2019 22:45:44 +0200 Message-Id: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org 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: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- src/wio/wio.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index c51910f4d..1645aa54e 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -1504,7 +1504,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); $ic = "${_}"; foreach $interface (@devs_net) { - next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE')); + next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"} eq 'PPPOE'); if ( $netsettings{"$ic"."_DEV"} eq $interface ) { if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) { print"$Lang::tr{$devs_alt[$in]}"; @@ -1558,7 +1558,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]); @@ -1569,10 +1569,10 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); print"$Lang::tr{"; last SWITCH; } - else { + } + else { print"$Lang::tr{"; last SWITCH; - } } } @@ -1872,7 +1872,7 @@ SWITCH: { } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]);