webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix aesthetic issues in remote.cgi and ship them

Browse Source 
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>
This commit is contained in:
Peter Müller
2018-05-07 17:01:58 +02:00
committed by Michael Tremer
parent 6d92ee11de
commit ea566f8485
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/121/filelists/files
View File

@@ -1,3 +1,5 @@
etc/system-release etc/system-release
etc/issue etc/issue
etc/ssl/certs/ca-bundle.crt etc/ssl/certs/ca-bundle.crt
srv/web/ipfire/cgi-bin/remote.cgi
var/ipfire/langs

24
html/cgi-bin/remote.cgi
View File

@@ -174,14 +174,20 @@ END
print "</form>\n"; 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 print <<END
<tr><td class='boldbase'><b>$Lang::tr{'ssh key'}</b></td> <thead>
<td class='boldbase'><b>$Lang::tr{'ssh fingerprint'}</b></td> <tr>
<td class='boldbase'><b>$Lang::tr{'ssh key size'}</b></td></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 END
; ;
@@ -191,11 +197,11 @@ END
&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA"); &viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA");
&viewkey("/etc/ssh/ssh_host_ed25519_key.pub","ED25519"); &viewkey("/etc/ssh/ssh_host_ed25519_key.pub","ED25519");
print "</table>\n"; print "</tbody>\n</table>\n";
&Header::closebox(); &Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{'ssh active sesstions'}); &Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'});
print <<END; print <<END;
<table class="tbl" width='66%'> <table class="tbl" width='66%'>
@@ -242,7 +248,7 @@ sub viewkey
my @temp = split(/ /,`/usr/bin/ssh-keygen -l -f $key`); my @temp = split(/ /,`/usr/bin/ssh-keygen -l -f $key`);
my $keysize = &Header::cleanhtml($temp[0],"y"); my $keysize = &Header::cleanhtml($temp[0],"y");
my $fingerprint = &Header::cleanhtml($temp[1],"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'> <tr bgcolor='$table_colour'>
<td>$username</td> <td>$username</td>
<td>$logintime</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 align='center'><a href='country.cgi#$ccode'><img src='$flag_icon' border='0' alt='$ccode' title='$ccode' /></a></td>
<td>$rdns</td> <td>$rdns</td>
</tr> </tr>

2
langs/de/cgi-bin/de.pl
View File

@@ -2149,7 +2149,7 @@
'ssh' => 'SSH', 'ssh' => 'SSH',
'ssh access' => 'SSH-Zugriff', 'ssh access' => 'SSH-Zugriff',
'ssh access tip' => 'IPFire SSH läuft auf dem nicht-standard Port 222!', '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 fingerprint' => 'Fingerabdruck',
'ssh host keys' => 'SSH Host Schlüssel', 'ssh host keys' => 'SSH Host Schlüssel',
'ssh is disabled' => 'Secure Shell ist deaktiviert. Halte an.', 'ssh is disabled' => 'Secure Shell ist deaktiviert. Halte an.',

2
langs/en/cgi-bin/en.pl
View File

@@ -2187,7 +2187,7 @@
'ssh' => 'SSH', 'ssh' => 'SSH',
'ssh access' => 'SSH Access', 'ssh access' => 'SSH Access',
'ssh access tip' => 'IPFire SSH is not using default port 222!', '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 fingerprint' => 'Fingerprint',
'ssh host keys' => 'SSH Host Keys', 'ssh host keys' => 'SSH Host Keys',
'ssh is disabled' => 'SSH is disabled. Stopping.', 'ssh is disabled' => 'SSH is disabled. Stopping.',