From patchwork Tue Nov 3 14:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3630 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 4CQXGN2MRhz3why for ; Tue, 3 Nov 2020 14:29:00 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CQXGM2rrSzpW; Tue, 3 Nov 2020 14:28:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CQXGM1Qbfz2xrJ; Tue, 3 Nov 2020 14:28: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 4CQXGK6t0pz2xd0 for ; Tue, 3 Nov 2020 14:28:57 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CQXGJ4jlYzRh for ; Tue, 3 Nov 2020 14:28:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604413737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZ29ZGJZNB0FjbpQ2pdjUNDP1FyM+sRwNaE39dK/agU=; b=KHMnA8ZFW1zSoAeWBBFq+w8eHRRA8hDS4p5Tnd0R/fb7G2fAfGXBWws/Vu3e1udrGUuGro 3x3GiE8WWB9sNxCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604413737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZ29ZGJZNB0FjbpQ2pdjUNDP1FyM+sRwNaE39dK/agU=; b=Ggf39/Qb8bN4Ky5afw2rnk2jvmwSN1PhyTa9SLh4jaCqZD7wMoTTg8M4zlBVPr8hD2aoHq 2t3WrJ/i04ZGetJloDv9HBohO89BH7hgREWIrgB7D57ZFF4iecrASIMMI7HZpFVlQUeSVL ysMJTLeJ6wzUPewKDjT/RJQwDBwTN+yXn5HrSO2IHRMdactmmUNj2DGPC85s8hLA77XGmc IJivFxqJUHrXdOaZ2DLQTMmClgyCjYmg8mYqTqsOq54h8o4VgLSkmKqLy4wYAOUTuVwLnf oNH4R+Gxp8u9gYRPa2xyKb9CHy+tkxneS+hg2wXrm9gFoB1ZY3rAt86+Q6/lKw== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/4] location-functions.pl: add functions for fetching AS information Message-ID: <8cce16a8-5a92-acbb-28e7-68df2a95d887@ipfire.org> Date: Tue, 3 Nov 2020 15:28:53 +0100 MIME-Version: 1.0 Content-Language: en-US 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" Signed-off-by: Peter Müller --- config/cfgroot/location-functions.pl | 68 +++++++++++++++++++--------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index 2cfe7f908..ee03a6611 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -1,25 +1,23 @@ #!/usr/bin/perl -w -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 - 2020 IPFire Team . # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### package Location::Functions; @@ -83,7 +81,7 @@ sub verify ($) { } # -## Function to the the country code of a given address. +## Function to get the country code of a given address. # sub lookup_country_code($$) { my ($db_handle, $address) = @_; @@ -221,4 +219,30 @@ sub address_has_flags($) { return @flags; } +# +## Function to get the Autonomous System Number of a given address. +# +sub lookup_asn($$) { + my ($db_handle, $address) = @_; + + # Lookup the given address. + my $asn = &Location::lookup_asn($db_handle, $address); + + # Return the number of the Autonomous System + return $asn; +} + +# +## Function to get the name of an Autonomous System. +# +sub get_as_name($$) { + my ($db_handle, $asn) = @_; + + # Fetch the name of this AS... + my $as_name = &Location::get_as_name($db_handle, $asn); + + # Return the name of the Autonomous System + return $as_name; +} + 1; From patchwork Tue Nov 3 14:29:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3631 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CQXGk4kCdz3why for ; Tue, 3 Nov 2020 14:29:18 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CQXGk2kfjzTf; Tue, 3 Nov 2020 14:29:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CQXGk2BBGz2yXQ; Tue, 3 Nov 2020 14:29:18 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CQXGj30Hnz2xjX for ; Tue, 3 Nov 2020 14:29:17 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CQXGg6M79zTf for ; Tue, 3 Nov 2020 14:29:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604413756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bdWt6NMwnWS36guVpH9g/11O2uwx4BEuc05NAGVzPlQ=; b=sDLuocXKLQPe81YbQycDwlQfpeqwlHApBsBvcRkSClulGlhFO0UuBr+w78/Pu2WEc2EnRM m1Ac0MslOnm0c0DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604413756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bdWt6NMwnWS36guVpH9g/11O2uwx4BEuc05NAGVzPlQ=; b=UZkVNiu+EQ/gncl7UNJg00B2bHyoz1x7byHdMHLhUdiqZdjSMp+uRmxJ6PtZoyPvue9imz XaxoRoJCmtr3Y8qhGBROL5V23kurpIfYn38e7u5+S3X6h32fb/rzXJgzEWkbgCZxwZYzjh g/nWnA8TZYt+WWfppNBO++L/uGNdTI7yAkCD3qAOn+MFa5rBRK+4fx/gcK/UB1EYMUtewa w340jaXmg/+60P33yJIuhCrmcaieAxXrjN1e2QjynpuR+5PA1Q06zGqqG9+D9PudO9V0bX JVsKO55Ync7/BFkS5ek1ZnSm7ENuiC7aSD0w3+JZ/nmx2tjO9evhUx2Q5uZswg== Subject: [PATCH 2/4] ipinfo.cgi: display AS information as well To: development@lists.ipfire.org References: <8cce16a8-5a92-acbb-28e7-68df2a95d887@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Tue, 3 Nov 2020 15:29:14 +0100 MIME-Version: 1.0 In-Reply-To: <8cce16a8-5a92-acbb-28e7-68df2a95d887@ipfire.org> Content-Language: en-US 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" Signed-off-by: Peter Müller --- html/cgi-bin/ipinfo.cgi | 143 +++++++++++++++++++++++++--------------- 1 file changed, 91 insertions(+), 52 deletions(-) diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index d8cb6c6b7..1b56e08f9 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,12 +32,16 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "${General::swroot}/location-functions.pl"; +# Load colours for current theme... +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + my %cgiparams=(); &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'ip info'}, 1, ''); -&Header::openbigbox('100%', 'left'); my @lines=(); my $extraquery=''; @@ -57,18 +61,38 @@ my $whois_server = "whois.arin.net"; my $addr = CGI::param("ip") || ""; if (&General::validip($addr)) { + # Write HTML page header... + &Header::openpage($Lang::tr{'ip info for'} . ' ' . $addr, 1, ''); + &Header::openbigbox('100%', 'left'); + my $iaddr = inet_aton($addr); my $hostname = gethostbyaddr($iaddr, AF_INET); - if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; } + if (!$hostname) { $hostname = $Lang::tr{'ptr lookup failed'}; } - # enumerate location information for IP address... + # Enumerate location information for IP address... my $db_handle = &Location::Functions::init(); my $ccode = &Location::Functions::lookup_country_code($db_handle, $addr); + my $cname = &Location::Functions::get_full_country_name($ccode); my @network_flags = &Location::Functions::address_has_flags($addr); # Try to get the continent of the country code. my $continent = &Location::get_continent_code($db_handle, $ccode); + # Enumerate Autonomous System details for IP address... + my $asn = &Location::Functions::lookup_asn($db_handle, $addr); + my $as_name; + if ($asn) { + $as_name = &Location::Functions::get_as_name($db_handle, $asn); + + # In case we have found an AS name, make output more readable... + if ($as_name) { + $as_name = "- " . $as_name; + } + $asn = "AS" . $asn; + } else { + $asn = $Lang::tr{'asn lookup failed'}; + } + # Check if a whois server for the continent is known. if($whois_servers_by_continent{$continent}) { # Use it. @@ -77,6 +101,63 @@ if (&General::validip($addr)) { my $flag_icon = &Location::Functions::get_flag_icon($ccode); + &Header::openbox('100%', 'left', $Lang::tr{'ip basic info'}); + + print < + + + + + + + + + + + + + +END + + # Check if the address has a flag. + if (@network_flags) { + # Get amount of flags for this network. + my $flags_amount = @network_flags; + my $processed_flags; + + # Loop through the array of network_flags. + foreach my $network_flag (@network_flags) { + # Increment value of processed flags. + $processed_flags++; + + # Get the network flag name. + my $network_flag_name = &Location::Functions::get_full_country_name($network_flag); + + # Colorize columns. + my $col; + if ($processed_flags % 2) { + $col = "bgcolor='$color{'color20'}'"; } + else { + $col = "bgcolor='$color{'color22'}'"; + } + + # Write table row... + print < + + + +END + } + } + + + print "
$Lang::tr{'country'}$cname $cname
$Lang::tr{'ptr'}$hostname
$Lang::tr{'autonomous system'}$asn $as_name
$network_flag_name$Lang::tr{'yes'}
\n"; + print " \n"; + + &Header::closebox(); + my $sock = new IO::Socket::INET ( PeerAddr => $whois_server, PeerPort => 43, Proto => 'tcp'); if ($sock) { @@ -108,53 +189,7 @@ if (&General::validip($addr)) { @lines = ( "$Lang::tr{'unable to contact'} $whois_server" ); } - &Header::openbox('100%', 'left', $addr . " $ccode (" . $hostname . ') : '.$whois_server); - - # Check if the address has a flag. - if (@network_flags) { - # Get amount of flags for this network. - my $flags_amount = @network_flags; - my $processed_flags; - - # The message string which will be displayed. - my $message_string = "This address is marked as"; - - # Loop through the array of network_flags. - foreach my $network_flag (@network_flags) { - # Increment value of processed flags. - $processed_flags++; - - # Get the network flag name. - my $network_flag_name = &Location::Functions::get_full_country_name($network_flag); - - # Add the flag name to the message string. - $message_string = "$message_string" . " $network_flag_name"; - - # Check if multiple flags are set for this network. - if ($flags_amount gt "1") { - # Check if the the current flag is the next-to-last one. - if ($processed_flags eq $flags_amount - 1) { - $message_string = "$message_string" . " and "; - - # Check if the current flag it the last one. - } elsif ($processed_flags eq $flags_amount) { - # The message is finished add a dot for ending the sentence. - $message_string = "$message_string" . "."; - - # Otherwise add a simple comma to the message string. - } else { - $message_string = "$message_string" . ", "; - } - } else { - # Nothing special to do, simple add a dot to finish the sentence. - $message_string = "$message_string" . "."; - } - } - - # Display the generated notice. - print "

$message_string

\n"; - print "
\n"; - } + &Header::openbox('100%', 'left', $Lang::tr{'whois results from'} . " " . $whois_server); print "
\n";
 	foreach my $line (@lines) {
@@ -163,6 +198,10 @@ if (&General::validip($addr)) {
 	print "
\n"; &Header::closebox(); } else { + # Open HTML page header in case of invalid IP addresses + &Header::openpage($Lang::tr{'ip info'}, 1, ''); + &Header::openbigbox('100%', 'left'); + &Header::openbox('100%', 'left', $Lang::tr{'invalid ip'}); print < From patchwork Tue Nov 3 14:29:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3632 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CQXHG6l8yz3why for ; Tue, 3 Nov 2020 14:29:46 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CQXHG3kWVzTf; Tue, 3 Nov 2020 14:29:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CQXHG3CFtz2yXb; Tue, 3 Nov 2020 14:29:46 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CQXHF1tbyz2xrJ for ; Tue, 3 Nov 2020 14:29:45 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CQXHD2BpKzRh for ; Tue, 3 Nov 2020 14:29:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604413784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wjg36ZAC9erWoyhOmo9Icg+4qG3EDPzblhz6/v90H+4=; b=yVXoCLM++Lxpowx7vYz8r3QWeDQxuPOBCwYiR4P1aFG6YnH0SURX2eJd6b1nvP2OnUMD77 W8dwHNwGzNOx0dBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604413784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wjg36ZAC9erWoyhOmo9Icg+4qG3EDPzblhz6/v90H+4=; b=Lje3eFHuOLfRlUqVkJeBfZMq1Nx8S59IqpzVZkGJrS8HFWXaN8HMabw8uAAb3V9HbHUHSV lPH4g71IaRWda1PwJl/leRwMRHo3ZLh2btrs8VpwHALvPpV+BNXHmbV58Dnqf32lhpJnuG nODSflQQyJt0pzzdTa3/RV8mx8VZmqP3spllVgICop8lBN2hm5yTzdqYik9X1XiTIxPUe7 t9ktW78Y5vA9/5utRJSfBrmmkdotuhs4M9FGcFXChULcqjUMjCbWUdYY7PnSjDwpR3vEjs PwxdeK+XbJmffbe67xQc2QU5Zyy9WuZFtiI5RuiS9Czf0pT+8cmPGwJMZQ1/kw== Subject: [PATCH 3/4] langs: add changed strings to German and English translations To: development@lists.ipfire.org References: <8cce16a8-5a92-acbb-28e7-68df2a95d887@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <1a62c4f6-61f7-0090-0875-76d203001a80@ipfire.org> Date: Tue, 3 Nov 2020 15:29:42 +0100 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US 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" Signed-off-by: Peter Müller --- html/cgi-bin/dns.cgi | 2 +- html/cgi-bin/remote.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 8 ++++++-- langs/en/cgi-bin/en.pl | 8 ++++++-- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 11 files changed, 22 insertions(+), 14 deletions(-) diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 0a097e2c0..fc8d65308 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -609,7 +609,7 @@ END $rdns = gethostbyaddr($iaddr, AF_INET); } - if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; } + if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; } # Mark ISP name servers as disabled if ($id <= 2 && $enabled eq "disabled") { diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 9c742669b..a99628aec 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -297,7 +297,7 @@ sub printactivelogins() # get rDNS... my $iaddr = inet_aton($remoteip); my $rdns = gethostbyaddr($iaddr, AF_INET); - if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }; + if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; }; my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'}; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6ad0e02c5..63b2844ec 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -444,12 +444,14 @@ 'are you sure' => 'Sind Sie sicher?', 'arp table entries' => 'Einträge der ARP-Tabelle', 'artist' => 'Künstler', +'asn lookup failed' => 'AS-Auflösung gescheitert', 'atm device' => 'Device:', 'atm settings' => 'ATM-Einstellungen', 'attemps' => 'Versuche', 'attention' => 'ACHTUNG', 'august' => 'August', 'authentication' => 'Authentifizierung:', +'autonomous system' => 'Autonomes System', 'automatic' => 'Automatisch', 'available updates' => 'Verfügbare Updates:', 'average' => 'Durchschnitt', @@ -1504,7 +1506,8 @@ 'ip alias added' => 'Externer IP-Alias hinzugefügt', 'ip alias changed' => 'Externer IP-Alias geändert', 'ip alias removed' => 'Externer IP-Alias entfernt', -'ip info' => 'IP-Information', +'ip info' => 'IP-Informationen', +'ip info for' => 'IP-Informationen für', 'ipfire has now rebooted' => 'IPFire wird neu gestartet.', 'ipfire has now shutdown' => 'IPFire wird heruntergefahren.', 'ipfire side' => 'IPFire Seite:', @@ -1596,7 +1599,6 @@ 'logging server' => 'Protokollierungsserver', 'loginlogout' => 'Login/Logout', 'logs' => 'Protokolldateien', -'lookup failed' => 'Reverse Lookup gescheitert', 'loosedirectorychecking' => 'Loose directorychecking', 'low' => 'Niedrig', 'ls_dhcpd' => 'DHCP-Server:', @@ -2069,6 +2071,7 @@ 'proxy reports weekly' => 'Wöchentliche Berichte', 'psk' => 'PSK', 'ptr' => 'PTR', +'ptr lookup failed' => 'Reverse Lookup gescheitert', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', 'qos add subclass' => 'Unterklasse hinzufügen', @@ -2864,6 +2867,7 @@ 'week-graph' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', +'whois results from' => 'WHOIS-Ergebnisse von', 'wildcards' => 'Wildcards', 'wins server' => 'WINS-Server', 'wins support' => 'WINS-Support', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d00de3d03..1cdfe2bfd 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -443,12 +443,14 @@ 'are you sure' => 'Are you sure?', 'arp table entries' => 'ARP Table Entries', 'artist' => 'Artist', +'asn lookup failed' => 'AS lookup failed', 'atm device' => 'Device:', 'atm settings' => 'ATM settings', 'attemps' => 'Attempts', 'attention' => 'ATTENTION', 'august' => 'August', 'authentication' => 'Authentication:', +'autonomous system' => 'Autonomous System', 'automatic' => 'Automatic', 'available updates' => 'Available updates:', 'average' => 'Average', @@ -1531,7 +1533,8 @@ 'ip alias added' => 'External IP alias added', 'ip alias changed' => 'External IP alias changed', 'ip alias removed' => 'External IP alias removed', -'ip info' => 'IP Information', +'ip info' => 'IP information', +'ip info' => 'IP information for', 'ipfire has now rebooted' => 'IPFire is rebooting now.', 'ipfire has now shutdown' => 'IPFire is shutting down now.', 'ipfire side' => 'IPFire side:', @@ -1623,7 +1626,6 @@ 'logging server' => 'Logging Server', 'loginlogout' => 'Login/Logout', 'logs' => 'logs', -'lookup failed' => 'Reverse lookup failed', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Low', 'ls_dhcpd' => 'DHCP Server:', @@ -2099,6 +2101,7 @@ 'proxy reports weekly' => 'Weekly reports', 'psk' => 'PSK', 'ptr' => 'PTR', +'ptr lookup failed' => 'Reverse lookup failed', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos add subclass' => 'Add subclass', @@ -2907,6 +2910,7 @@ 'week-graph' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'Weeks', +'whois results from' => 'WHOIS results from', 'wildcards' => 'Wildcards', 'winbind daemon' => 'Winbind Daemon', 'wins server' => 'Wins Server', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ae155d26b..0e9b13787 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1096,7 +1096,7 @@ 'logging server' => 'Servidor de conexión', 'loginlogout' => 'Login/Logout', 'logs' => 'registros', -'lookup failed' => 'Falló la búsqueda reversiva', +'ptr lookup failed' => 'Falló la búsqueda reversiva', 'loosedirectorychecking' => 'Chequeo de loosedirectory', 'low' => 'Bajo', 'ls_dhcpd' => 'Servidor DHCP:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 00328440d..9cc4be695 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1629,7 +1629,7 @@ 'logging server' => 'Serveur de connexion', 'loginlogout' => 'Connexion/Quitter', 'logs' => 'Journaux', -'lookup failed' => 'La recherche inversée a échouée', +'ptr lookup failed' => 'La recherche inversée a échouée', 'loosedirectorychecking' => 'Echec de la vérification du répertoire', 'low' => 'Bas', 'ls_dhcpd' => 'Serveur DHCP :', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index d0e9dc4c9..b45be4207 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1410,7 +1410,7 @@ 'logging server' => 'Logging Server', 'loginlogout' => 'Login/Logout', 'logs' => 'Gestione Log', -'lookup failed' => 'Reverse lookup failed', +'ptr lookup failed' => 'Reverse lookup failed', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Basso', 'ls_dhcpd' => 'DHCP Server:', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index f67eb0383..4e471a597 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1389,7 +1389,7 @@ 'logging server' => 'Loggingserver', 'loginlogout' => 'Login/Logout', 'logs' => 'logs', -'lookup failed' => 'Reverse lookup mislukt', +'ptr lookup failed' => 'Reverse lookup mislukt', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Laag', 'ls_dhcpd' => 'DHCP Server:', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 3f4fc0143..fb2b40787 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1095,7 +1095,7 @@ 'logging server' => 'Serwer logowania', 'loginlogout' => 'Zalogowanie/wylogowanie', 'logs' => 'logi', -'lookup failed' => 'Reverse lookup failed', +'ptr lookup failed' => 'Reverse lookup failed', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Niski', 'ls_dhcpd' => 'Serwer DHCP:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2c91a3fee..074f0cb2f 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1088,7 +1088,7 @@ 'logging server' => 'Сервер Логов', 'loginlogout' => 'Login/Logout', 'logs' => 'Логи', -'lookup failed' => 'Reverse lookup failed', +'ptr lookup failed' => 'Reverse lookup failed', 'loosedirectorychecking' => 'Loosedirectorychecking', 'low' => 'Low', 'ls_dhcpd' => 'DHCP сервер:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index b958d63fe..eeb1e13ce 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1540,7 +1540,7 @@ 'logging server' => 'Günlük Sunucusu', 'loginlogout' => 'Giriş/Çıkış', 'logs' => 'Günlükler', -'lookup failed' => 'Ters arama başarısız', +'ptr lookup failed' => 'Ters arama başarısız', 'loosedirectorychecking' => 'Serbest Dizin Denetimi', 'low' => 'Düşük', 'ls_dhcpd' => 'DHCP Sunucusu:', From patchwork Tue Nov 3 14:30:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3633 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CQXHj3Z4Tz3why for ; Tue, 3 Nov 2020 14:30:09 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CQXHj0sFFz1kl; Tue, 3 Nov 2020 14:30:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CQXHh4Jx4z2yXQ; Tue, 3 Nov 2020 14:30:08 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CQXHg06pGz2xd0 for ; Tue, 3 Nov 2020 14:30:07 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CQXHf1DZnz1k1 for ; Tue, 3 Nov 2020 14:30:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604413806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7QiNdl6C7Cjp6VnxMVGqU37IpZ6c9hB0rXt7Rmex4Q4=; b=GcLWHgL0wP9obFqF9U2m841d3PSzBgCucazns6QOtKJzqEui1vFBizFtD53lgRNc85VtRL O8wWSR1J1xkTmhCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604413806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7QiNdl6C7Cjp6VnxMVGqU37IpZ6c9hB0rXt7Rmex4Q4=; b=Y9JQOszpK2dqWmcgDpq74SG4eZ3sGsBu9Tu8nnkHR9CANrnVrbvW+8miXqu34uCXQgTonF hRcLU7cuUS6lsrQBXmk6iXFqRpI3Ic6wFROfvXXdcMtiQLU/Gi95S2bbDrEx5NMpV5MPRc qATRgSkRlGue6AoN9BquR5uyeDKK43MqzdW+Y8Vq1shxE004zfiRf2S4FIi99f2TUqGHJy guQfguV2tP5LEcl7sF6n3S/g22in0oLLXfTtfbRmTmG5NS0m5kWDCoxSmubF6jY+HAajQD wXufUaad3VK4FaiWTH3z0YcxUel0GuBdsA/rEerZSuR8vuaHxh9ktjVt8b/y3Q== Subject: [PATCH 4/4] langs: Hrmpf, add forgotten string To: development@lists.ipfire.org References: <8cce16a8-5a92-acbb-28e7-68df2a95d887@ipfire.org> <1a62c4f6-61f7-0090-0875-76d203001a80@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: <2f6c117c-9d96-b83e-f3f1-1175b1947b0f@ipfire.org> Date: Tue, 3 Nov 2020 15:30:04 +0100 MIME-Version: 1.0 In-Reply-To: <1a62c4f6-61f7-0090-0875-76d203001a80@ipfire.org> Content-Language: en-US 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" Signed-off-by: Peter Müller --- html/cgi-bin/ipinfo.cgi | 1 - langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 1b56e08f9..4d0e1f63a 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -152,7 +152,6 @@ END } } - print " \n"; print " \n"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 63b2844ec..c2c527851 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1506,6 +1506,7 @@ 'ip alias added' => 'Externer IP-Alias hinzugefügt', 'ip alias changed' => 'Externer IP-Alias geändert', 'ip alias removed' => 'Externer IP-Alias entfernt', +'ip basic info' => 'Grundlegende IP-Informationen', 'ip info' => 'IP-Informationen', 'ip info for' => 'IP-Informationen für', 'ipfire has now rebooted' => 'IPFire wird neu gestartet.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1cdfe2bfd..29a72a377 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1533,6 +1533,7 @@ 'ip alias added' => 'External IP alias added', 'ip alias changed' => 'External IP alias changed', 'ip alias removed' => 'External IP alias removed', +'ip basic info' => 'Basic IP information', 'ip info' => 'IP information', 'ip info' => 'IP information for', 'ipfire has now rebooted' => 'IPFire is rebooting now.',