From patchwork Tue May 8 01:01:58 2018 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: 1759 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 05A8A60D14 for ; Mon, 7 May 2018 17:02:04 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 6A1E510F62E2; Mon, 7 May 2018 16:02:03 +0100 (BST) Authentication-Results: mail01.i.ipfire.org; dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id CAF2C10F62E2 for ; Mon, 7 May 2018 16:02:00 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1525705320; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=RXeGdAWNNPvqgPonLjbx6+0iGsbIMkAxaT9tj6stHyk=; b=F8FfA+Ujxeao9fQc9f9avSZNfIqicsTLQFhslsJZehxXoEBmJoILF3Ed/glnebXHMpywrA pWCV1Qnwmh5PGNkGpPiV1VQZfu7eeJ5yCJ6d49iyeN23gRPxLQEoAGvLvTMVZtL4AwLluF h5+RGgFLBocjlwMJydhM2Rx4/32zDwItFqF2rlsMTwRZt2BTVaV6lTopKJgvCgFzsHv/5E PLp0kWc0XXMWfWaJ+HgGAe4K/6TtvvewDEqKFExxwvPoPqt+/Nz+x2oRUtIjXDI2DMiUXi kBk5NtH3+voVcAtN1wQp4oEXp1B8SxKgeQm/i+R52FOOZCRm1WqvnQRZwHER8A== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] fix aesthetic issues in remote.cgi and ship them Openpgp: preference=signencrypt Message-ID: <3c36bedd-7eed-b052-0761-7aca79bd137b@link38.eu> Date: Mon, 7 May 2018 17:01:58 +0200 MIME-Version: 1.0 X-Spamd-Result: default: False [-9.64 / 11.00]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; DKIM_TRACE(0.00)[link38.eu:+]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; HAS_ATTACHMENT(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; RCVD_COUNT_ZERO(0.00)[0]; IP_SCORE(-3.78)[ip: (-9.90), ipnet: 37.120.160.0/19(-4.95), asn: 197540(-3.96), country: DE(-0.09)]; RCPT_COUNT_ONE(0.00)[1]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; R_DKIM_ALLOW(-0.20)[link38.eu]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2] X-Spam-Status: No, score=-9.64 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 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" Fix some minor cosmetic issues on remote.cgi as well as a typo in the language files ("sesstions" -> "sessions"). The changes are listed in "filelists" for Core Update 121. Signed-off-by: Peter Müller --- config/rootfiles/core/121/filelists/files | 2 ++ html/cgi-bin/remote.cgi | 24 +++++++++++++++--------- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files index 4ce37f9ed..7b7aa4fd9 100644 --- a/config/rootfiles/core/121/filelists/files +++ b/config/rootfiles/core/121/filelists/files @@ -1,3 +1,5 @@ etc/system-release etc/issue etc/ssl/certs/ca-bundle.crt +srv/web/ipfire/cgi-bin/remote.cgi +var/ipfire/langs diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 5acce4e99..1b3dfed70 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -174,14 +174,20 @@ END print "\n"; -&Header::openbox('100%', 'left', $Lang::tr{'ssh host keys'}); +&Header::openbox('100%', 'center', $Lang::tr{'ssh host keys'}); -print "\n"; +print "
\n"; print < - - + + + + + + + + + END ; @@ -191,11 +197,11 @@ END &viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA"); &viewkey("/etc/ssh/ssh_host_ed25519_key.pub","ED25519"); -print "
$Lang::tr{'ssh key'}$Lang::tr{'ssh fingerprint'}$Lang::tr{'ssh key size'}
$Lang::tr{'ssh key'}$Lang::tr{'type'}$Lang::tr{'ssh fingerprint'}$Lang::tr{'ssh key size'}
\n"; +print "\n\n"; &Header::closebox(); -&Header::openbox('100%', 'center', $Lang::tr{'ssh active sesstions'}); +&Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'}); print < @@ -242,7 +248,7 @@ sub viewkey my @temp = split(/ /,`/usr/bin/ssh-keygen -l -f $key`); my $keysize = &Header::cleanhtml($temp[0],"y"); my $fingerprint = &Header::cleanhtml($temp[1],"y"); - print "$key ($name)$fingerprint$keysize\n"; + print "$key$name$fingerprint$keysize\n"; } } @@ -287,7 +293,7 @@ sub printactivelogins() $username $logintime - $remoteip + $remoteip $ccode $rdns diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 68dce535f..edafea5cd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2148,7 +2148,7 @@ 'ssh' => 'SSH', 'ssh access' => 'SSH-Zugriff', 'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!', -'ssh active sesstions' => 'Aktive Benutzeranmeldungen', +'ssh active sessions' => 'Aktive Benutzeranmeldungen', 'ssh fingerprint' => 'Fingerabdruck', 'ssh host keys' => 'SSH Host Schlüssel', 'ssh is disabled' => 'Secure Shell ist deaktiviert. Halte an.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 595e00a55..bebb479cf 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2186,7 +2186,7 @@ 'ssh' => 'SSH', 'ssh access' => 'SSH Access', 'ssh access tip' => 'IPFire SSH is not using default port 222!', -'ssh active sesstions' => 'Active logins', +'ssh active sessions' => 'Active logins', 'ssh fingerprint' => 'Fingerprint', 'ssh host keys' => 'SSH Host Keys', 'ssh is disabled' => 'SSH is disabled. Stopping.',