From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH] fix aesthetic issues in remote.cgi and ship them Date: Mon, 07 May 2018 17:01:58 +0200 Message-ID: <3c36bedd-7eed-b052-0761-7aca79bd137b@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1005317246440256980==" List-Id: --===============1005317246440256980== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller --- 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/cor= e/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 =20 print "\n"; =20 -&Header::openbox('100%', 'left', $Lang::tr{'ssh host keys'}); +&Header::openbox('100%', 'center', $Lang::tr{'ssh host keys'}); =20 -print "\n"; +print "
\n"; =20 print < - - + + + + + + + + + END ; =20 @@ -191,11 +197,11 @@ END &viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA"); &viewkey("/etc/ssh/ssh_host_ed25519_key.pub","ED25519"); =20 -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"; =20 &Header::closebox(); =20 -&Header::openbox('100%', 'center', $Lang::tr{'ssh active sesstions'}); +&Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'}); =20 print < @@ -242,7 +248,7 @@ sub viewkey my @temp =3D split(/ /,`/usr/bin/ssh-keygen -l -f $key`); my $keysize =3D &Header::cleanhtml($temp[0],"y"); my $fingerprint =3D &Header::cleanhtml($temp[1],"y"); - print "$key ($name)$fingerprint$keysize\n"; + print "$key$name= $fingerprint$keysize\n"; } } =20 @@ -287,7 +293,7 @@ sub printactivelogins() $username $logintime - $remoteip + $remoteip= 3D'$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' =3D> 'SSH', 'ssh access' =3D> 'SSH-Zugriff', 'ssh access tip' =3D> 'IPFire SSH l=C3=A4uft auf dem nicht-standard Port 222= !', -'ssh active sesstions' =3D> 'Aktive Benutzeranmeldungen', +'ssh active sessions' =3D> 'Aktive Benutzeranmeldungen', 'ssh fingerprint' =3D> 'Fingerabdruck', 'ssh host keys' =3D> 'SSH Host Schl=C3=BCssel', 'ssh is disabled' =3D> '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' =3D> 'SSH', 'ssh access' =3D> 'SSH Access', 'ssh access tip' =3D> 'IPFire SSH is not using default port 222!', -'ssh active sesstions' =3D> 'Active logins', +'ssh active sessions' =3D> 'Active logins', 'ssh fingerprint' =3D> 'Fingerprint', 'ssh host keys' =3D> 'SSH Host Keys', 'ssh is disabled' =3D> 'SSH is disabled. Stopping.', --=20 2.13.6 --===============1005317246440256980== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUVC Q2dBR0JRSmE4R3BtQUFvSkVObEk4Zzk5ZTU5bzFORVFBSWR4R1JmWVBEa3o4MVRzNEMyUEdjcWsK WW9IVys0U2dLUkpjWFA2bzRobVJ0UXVWbzcycHZjOHlramZnQVVaaUxJTFFjSUlGYU8rcWNqVjFZ TTFnMU9BLwpFdHBYNHhpSDd1SFBWNWxPZzFRcjJZMUhFb0JQa3JoRDczby80VUx6RkROVFZRSzBV OXduTDhmZmltTGNnTGJSCittbEl5bVFGSEw5dU5QZzhYWDE0YS9mNDE4MDVHM1lHcVpkSkt4VnZC MTQweEtlbzJmeXQreGk5eDEvTG5lMk0KUEkzWlc5aXBzRFlWVGwzNGFLZ0I0dTV5cis0VmsvOGla NHhRcEc1ZG1SMW5DeXVPb2RRQkNBd285SzQ2dzNWOQo4elFaVlhxM3BvZEtnVERGTlZUODkvUDNB NjB3cVNJTWFudmw4UWxlUHFUN1B1a1pIeGJUVi9QMlhyakVSVDQrClF2RFFWU1B5N0dmUmhaQThZ aUVsNnRibXdnR3hidFYvSlgxMVpSMDFOcVZQNXQ1dW1NbFFTaTBEUDhwMWZtS3oKRG9PTG9qdW9r Ynd4TW4weHQ1WXdJak9SQUQrTHlxd1E0WUpaLzUwVEYrRXFPMHlXeFJpQk84TUxDWkZXcFFqNApU MVBlQ0JoSUU3WkhvNUpQNzZiWjFud3E1eloyZTBRRHNLcEZhVDRBOVpLQzlQNHRYaThoaG8rVHNT Qi9QRnJ3Ck0wN1V5U1V6RGJPL0MzbzY1YjJvRXRvKzFTTDc0NzhmWURCbnpUQkFlaFE3VENNVUNE dXQ1dCtmVWxMODhidW0KbC92bk1MWllBSDBtVkd4MzFMZlYrRFF1bm1TS1ZzZ0E2QWdlWUVpUlVY Q0lXc0s4dDhqcGlua01DWEtQQVBvaAo5YWhZcldXOHJRdGpaYktWNXJ5bgo9c3NadAotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============1005317246440256980==--