From patchwork Tue Aug 4 19:31:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 3290 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 4BLlHR31CDz3x0m for ; Tue, 4 Aug 2020 19:31:31 +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 4BLlHQ0BPjzk9; Tue, 4 Aug 2020 19:31:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BLlHP6bLCz2xnM; Tue, 4 Aug 2020 19:31:29 +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 4BLlHN1XMGz2xWX for ; Tue, 4 Aug 2020 19:31:28 +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 (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BLlHM64tZzk9; Tue, 4 Aug 2020 19:31:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1596569488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=vk4vB7Wm/ecWJu2KY35IDQRcQDQFHtqVjlgvEh2PlHg=; b=lhI1aZ1d2b7mmrhpwe8XlW9w07PMhNbvF9zuOIz2rPSs068M2YuVg/+zNMPhnA80xdrU3J JelSlIZoYij+nuedd9jpL0zI/qtkrSJv6i5Uz4XYk7L046xaCHEX9Up/GmCRRMnw476wrA lqGFZPworkdc8ztw16yivQk2CISeYEXuy9hBkx9LpOrUbZGROqDbuyyk1JfhmHsJkt5JEp Pd3Cgg8C6xnLEAkkpLWc/QLEQ0h5cqZl2wNPHhcAeOqC5VvlrJsMnYn6WmnIyCzTJjjuSH 2zHf87XCyIIgNf31AVT1PJI0Rlij6JrM0alMznUeeevLMqmS/v0qxbbHmkxNyw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1596569488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=vk4vB7Wm/ecWJu2KY35IDQRcQDQFHtqVjlgvEh2PlHg=; b=3aij3m2ajasuYLio4sdD1O3j+TRG1Df43IeDD8Spi5+UvCnIQ7hrEBXM1hedHg8pBugR2a djqYg9niaKDtF4Ag== From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH 1/3] WIO: code cleanup Date: Tue, 4 Aug 2020 21:31:13 +0200 Message-Id: <20200804193115.22656-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass 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: Stephan Feddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- src/wio/wio.cgi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index a92a44473..a5d3d149e 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -21,7 +21,7 @@ # # ############################################################################### # -# Version: 2020/06/01 13:29:23 +# Version: 2020/08/04 21:12:23 # # This wio.cgi is based on the code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -1152,7 +1152,7 @@ close (FILE); foreach (@ddns) { chomp; - + @temp = split (/\,/, $_); if ( $temp[7] eq "on" ) { @@ -1161,7 +1161,7 @@ close (FILE); else { $bgcolor = "blue"; } - + print"$temp[1].$temp[2]"; if ( $iddyndns++ ne (@ddns-1) ) { print"
\n"; } } @@ -1334,7 +1334,7 @@ foreach $key (keys %ovpnconfighash) { if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { my ( @output, @tustate ) = ''; my $tport = $ovpnconfighash{$key}[22]; - my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); if ($tport ne '') { $tnet->open('127.0.0.1'); @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); @@ -1535,7 +1535,6 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } else { print"$Lang::tr{$devs_alt[$in]}"; - } last SWITCH; }