Allow username fortransfer to be specified

Author: jcameron

Diff for: lang/en

@@ -7327,6 +7327,7 @@ transfer_host0=New system
 transfer_savehost=Save for later use?
 transfer_ssh=SSH
 transfer_webmin=Webmin RPC
+transfer_user=Login for destination system
 transfer_pass=Password for destination system
 transfer_passdef=(optional if SSH authentication is configured)
 transfer_overwrite=Over-write existing domain?

Diff for: transfer.cgi

@@ -9,14 +9,14 @@ $d = &get_domain($in{'dom'});
 
 # Validate inputs
 my @hosts = &get_transfer_hosts();
-$user = 'root';
 if ($in{'host_mode'}) {
 	# Use an old host
 	my ($h) = grep { $_->[0] eq $in{'oldhost'} } @hosts;
 	$h || &error($text{'transfer_eoldhost'});
 	$host = $h->[0];
 	$pass = $h->[1];
 	$proto = $h->[2] || 'ssh';
+	$user = $h->[3] || 'root';
 	}
 else {
 	# Entering a new host
@@ -25,16 +25,18 @@ else {
 	&to_ipaddress($hostname) || &to_ip6address($hostname) ||
 		&error($text{'transfer_ehost2'});
 	$host = $in{'host'};
+	$user = $in{'hostuser'};
 	$pass = $in{'hostpass'};
 	$proto = $in{'proto'};
 	if ($in{'savehost'}) {
 		my ($h) = grep { $_->[0] eq $in{'host'} } @hosts;
 		if ($h) {
 			$h->[1] = $pass;
 			$h->[2] = $proto;
+			$h->[3] = $user;
 			}
 		else {
-			push(@hosts, [ $host, $pass, $proto ]);
+			push(@hosts, [ $host, $pass, $proto, $user ]);
 			}
 		&save_transfer_hosts(@hosts);
 		}

Diff for: transfer_form.cgi

@@ -77,6 +77,10 @@ else {
 	print &ui_table_row($text{'transfer_host'}, $hfield);
 	}
 
+# Root login
+print &ui_table_row($text{'transfer_user'},
+	&ui_textbox("hostuser", "root", 20));
+
 # Root password
 print &ui_table_row($text{'transfer_pass'},
 	&ui_password("hostpass", undef, 20)." ".

Diff for: virtual-server-lib-funcs.pl

@@ -19455,7 +19455,8 @@ sub get_transfer_hosts
 sub save_transfer_hosts
 {
 my $hfile = "$module_config_directory/transfer-hosts";
-my %hosts = map { $_->[0], $_->[1].($_->[2] ? " ".$_->[2] : "") } @_;
+my %hosts = map { $_->[0], $_->[1]." ".($_->[2] || "ssh")." ".
+			   ($_->[3] || "root") } @_;
 &write_file($hfile, \%hosts);
 &set_ownership_permissions(undef, undef, 0600, $hfile);
 }