From ea566f8485462dee02e9385aa5b5e4d7935d131d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@link38.eu>
Date: Mon, 7 May 2018 17:01:58 +0200
Subject: [PATCH] fix aesthetic issues in remote.cgi and ship them
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 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 4ce37f9ed5..7b7aa4fd92 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 5acce4e997..1b3dfed70a 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -174,14 +174,20 @@ END
 
 print "</form>\n";
 
-&Header::openbox('100%', 'left', $Lang::tr{'ssh host keys'});
+&Header::openbox('100%', 'center', $Lang::tr{'ssh host keys'});
 
-print "<table>\n";
+print "<table class='tbl'>\n";
 
 print <<END
-<tr><td class='boldbase'><b>$Lang::tr{'ssh key'}</b></td>
-    <td class='boldbase'><b>$Lang::tr{'ssh fingerprint'}</b></td>
-    <td class='boldbase'><b>$Lang::tr{'ssh key size'}</b></td></tr>
+<thead>
+	<tr>
+		<th align="center"><strong>$Lang::tr{'ssh key'}</strong></th>
+		<th align="center"><strong>$Lang::tr{'type'}</strong></th>
+		<th align="center"><strong>$Lang::tr{'ssh fingerprint'}</strong></th>
+		<th align="center"><strong>$Lang::tr{'ssh key size'}</strong></th>
+	</tr>
+</thead>
+<tbody>
 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 "</table>\n";
+print "</tbody>\n</table>\n";
 
 &Header::closebox();
 
-&Header::openbox('100%', 'center', $Lang::tr{'ssh active sesstions'});
+&Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'});
 
 print <<END;
 		<table class="tbl" width='66%'>
@@ -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 "<tr><td>$key ($name)</td><td><code>$fingerprint</code></td><td align='center'>$keysize</td></tr>\n";
+    print "<tr><td><code>$key</code></td><td align='center'>$name</td><td><code>$fingerprint</code></td><td align='center'>$keysize</td></tr>\n";
   }
 }
 
@@ -287,7 +293,7 @@ sub printactivelogins()
 			<tr bgcolor='$table_colour'>
 				<td>$username</td>
 				<td>$logintime</td>
-				<td>$remoteip</td>
+				<td align='center'><a href='ipinfo.cgi?ip=$remoteip'>$remoteip</a></td>
 				<td align='center'><a href='country.cgi#$ccode'><img src='$flag_icon' border='0' alt='$ccode' title='$ccode' /></a></td>
 				<td>$rdns</td>
 			</tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3dab130263..edff684ea7 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2149,7 +2149,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 ef7dab5304..0c77ce4b24 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2187,7 +2187,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.',
-- 
2.39.2