remote.cgi: Move SSH Agent Forwarding to the top

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index d3df33204ba470328c2159d3ed85503d382f1ffb..72d94868acee75283f24e0ede0bfa0fb858b4e08 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1635,7 +1635,7 @@ WARNING: untranslated string: src port = Src Port
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh access = SSH Access
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh fingerprint = Fingerprint
 WARNING: untranslated string: ssh host keys = SSH Host Keys
 WARNING: untranslated string: ssh is disabled = SSH is disabled.  Stopping.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7b36e97787f8b2af1c76180775c2ca851181f710..f292ebb85a9b60e0f5192cb4ba2c3874524d2502 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1214,7 +1214,7 @@ WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e6981009f532fa9454a1b75c7a381a2e1de782ed..e903e017df907f08d199671f046e5e5cb37be0bd 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -866,7 +866,7 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: subnet mask = Subnet Mask
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 250db4a86a37b2090483e586c405b27e8b66b53a..c18ff4d2b93babecba254a081d6272f247160ee5 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -973,7 +973,7 @@ WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c53043520da75ba475b69c53c99b5d48fe48cee8..509a58f0b733fad693411e8c0433f23174a32e65 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1016,7 +1016,7 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7b36e97787f8b2af1c76180775c2ca851181f710..f292ebb85a9b60e0f5192cb4ba2c3874524d2502 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1214,7 +1214,7 @@ WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e1c209496c86028bea1d0e77d7fdb9cc78ae7e2e..d6fa07a3c70e04f140bc67de3e91cc35df738b7a 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1210,7 +1210,7 @@ WARNING: untranslated string: software version = Software Version
 WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 7a50e96b477103e2fb25b1666bbac8f5dff00271..9a4339db9294c7fe613c52062f3a0a26f51cd93d 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -875,7 +875,7 @@ WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: ssh active sessions = Active logins
-WARNING: untranslated string: ssh agent forwarding = Enable SSH agent forwarding
+WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since
 WARNING: untranslated string: ssh no active logins = No active logins
 WARNING: untranslated string: ssh username = Username

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 10d94fe99ba4759fbc7ac931cbf8e5aa7107f2b9..8beb84efa736aac3af9a4b6574f8adfe029e52bb 100644 (file)
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -145,6 +145,11 @@ print <<END
        <td><input type='checkbox' name='ENABLE_SSH' $checked{'ENABLE_SSH'}{'on'} /></td>
        <td class='base' colspan='2'>$Lang::tr{'ssh access'}</td>
 </tr>
+<tr>
+       <td>&nbsp;</td>
+       <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td>
+       <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td>
+</tr>
 <tr>
        <td>&nbsp;</td>
        <td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td>
@@ -165,11 +170,6 @@ print <<END
        <td><input type='checkbox' name='SSH_PORT' $checked{'SSH_PORT'}{'on'} /></td>
        <td width='100%' class='base'>$Lang::tr{'ssh port'}</td>
 </tr>
-<tr>
-       <td>&nbsp;</td>
-       <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td>
-       <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td>
-</tr>
 <tr>
        <td align='right' colspan='3'>
        <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' />

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 81a54a7da138023cd4d16ac5c1b6b42f1dba3038..98e99f150be14402e2d34addf20820848e9f311f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2232,7 +2232,7 @@
 'ssh access' => 'SSH Access',
 'ssh access tip' => 'IPFire SSH is not using default port 22!',
 'ssh active sessions' => 'Active logins',
-'ssh agent forwarding' => 'Enable SSH agent forwarding',
+'ssh agent forwarding' => 'Allow SSH Agent Forwarding',
 'ssh fingerprint' => 'Fingerprint',
 'ssh host keys' => 'SSH Host Keys',
 'ssh is disabled' => 'SSH is disabled.  Stopping.',