Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / html / cgi-bin / remote.cgi

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 9737b078dde0739e947dfbd0c6f2f1da7ba01bb2..10a3e87cc0c1ed9305e9a6d19423180b83105c40 100644 (file)
--- 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  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -120,13 +120,13 @@ $checked{'SSH_PORT'}{$remotesettings{'SSH_PORT'}} = "checked='checked'";
 
 if ($errormessage) {
        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-       print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
+       print "<font class='base'>$errormessage&nbsp;</font>\n";
        &Header::closebox();
 }
 
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-&Header::openbox('100%', 'left', 'SSH:');
+&Header::openbox('100%', 'left', $Lang::tr{'ssh'});
 print <<END
 <table width='100%'>
 <tr>
@@ -154,7 +154,7 @@ print <<END
        <td width='100%' class='base'>$Lang::tr{'ssh port'}</td>
 </tr>
 <tr>
-       <td align='center' colspan='3'><hr />
+       <td align='right' colspan='3'>
        <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' />
        <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart30'}' />
        <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
@@ -180,6 +180,8 @@ END
 &viewkey("/etc/ssh/ssh_host_key.pub","RSA1");
 &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2");
 &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA");
+&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA");
+&viewkey("/etc/ssh/ssh_host_ed25519_key.pub","ED25519");
 
 print "</table>\n";