Work on allowing domain owners to migrate domains

Author: jcameron

Diff for: acl_security.pl

@@ -21,7 +21,7 @@ sub acl_security_form
 	}
 print "</select></td> </tr>\n";
 
-foreach $q ('create', 'import', 'edit', 'local', 'stop') {
+foreach $q ('create', 'import', 'migrate', 'edit', 'local', 'stop') {
 	print "<tr> <td><b>",$text{'acl_'.$q},"</b></td> <td>\n";
 	printf "<input type=radio name=%s value=1 %s> %s\n",
 		$q, $_[0]->{$q} == 1 ? "checked" : "", $text{'yes'};

Diff for: defaultacl

@@ -1,6 +1,7 @@
 edit=1
 create=1
 import=1
+migrate=1
 domains=*
 stop=1
 local=1

Diff for: edit_limits.cgi

@@ -71,6 +71,11 @@ print &ui_table_row(&hlink($text{'limits_norename'}, "limits_norename"),
 	&ui_radio("norename", $d->{'norename'} ? 1 : 0,
 	       [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]));
 
+# Can migrate domains?
+print &ui_table_row(&hlink($text{'limits_migrate'}, "limits_migrate"),
+	&ui_radio("migrate", $d->{'migrate'} ? 1 : 0,
+	       [ [ 1, $text{'yes'} ], [ 0, $text{'no'} ] ]));
+
 # Force sub-domain under master domain
 print &ui_table_row(&hlink($text{'limits_forceunder'}, "limits_forceunder"),
 	&ui_radio("forceunder", $d->{'forceunder'} ? 1 : 0,

Diff for: feature-webmin.pl

@@ -506,6 +506,7 @@ sub set_user_modules
 	       'local' => 0,
 	       'nodbname' => $_[0]->{'nodbname'},
 	       'norename' => $_[0]->{'norename'},
+	       'migrate' => $_[0]->{'migrate'},
 	       'forceunder' => $_[0]->{'forceunder'},
 	       'safeunder' => $_[0]->{'safeunder'},
 	       'ipfollow' => $_[0]->{'ipfollow'},

Diff for: lang/en

@@ -1389,6 +1389,7 @@ acl_all=All domains
 acl_sel=Selected below ..
 acl_create=Can create new domains?
 acl_import=Can import existing domains?
+acl_migrate=Can migrate backups?
 acl_edit=Can edit existing domains?
 acl_local=Can edit local users?
 acl_stop=Can start and stop services?
@@ -2662,6 +2663,7 @@ limits_ealiasdomslimit=Missing or invalid maximum number of alias servers
 limits_erealdomslimit=Missing or invalid maximum number of non-alias servers
 limits_nodbname=Can choose database names?
 limits_norename=Can rename domains?
+limits_migrate=Can migrate backups?
 limits_forceunder=Allow sub-servers not under this domain?
 limits_safeunder=Allow sub-servers under other users' domains?
 limits_ipfollow=Sub-servers inherit IP address from parent?

Diff for: list-domains.pl

@@ -663,6 +663,8 @@ package virtual_server;
 				($d->{'nodbname'} ? "No" : "Yes"),"\n";
 			print "    Can rename servers: ",
 				($d->{'norename'} ? "No" : "Yes"),"\n";
+			print "    Can migrate backups: ",
+				($d->{'migrate'} ? "Yes" : "No"),"\n";
 			print "    Sub-servers must be under main domain: ",
 				($d->{'forceunder'} ? "Yes" : "No"),"\n";
 			print "    Sub-servers cannot be under other domains: ",

Diff for: migrate.cgi

@@ -8,7 +8,7 @@ require './virtual-server-lib.pl';
 &require_migration();
 
 # Parse source file input
-$src = &parse_backup_destination("src", \%in, 0, undef, undef);
+$src = &parse_backup_destination("src", \%in, !&master_admin(), undef, undef);
 ($mode) = &parse_backup_url($src);
 if ($mode == 0) {
 	-r $src || &error($text{'migrate_efile'});

Diff for: migrate_form.cgi

@@ -14,11 +14,7 @@ print &ui_table_start($text{'migrate_header'}, "width=100%", 2, [ "width=30%"]);
 
 # Source file
 print &ui_table_row($text{'migrate_file'},
-	&show_backup_destination("src", undef, 0, undef, 1, 0));
-#	&ui_radio("mode", 0,
-#		[ [ 0, &text('migrate_file0', &ui_upload("upload"))."<br>" ],
-#		  [ 1, &text('migrate_file1', &ui_textbox("file", undef, 50)).
-#		         &file_chooser_button("file") ] ]));
+	&show_backup_destination("src", undef, !&master_admin(), undef, 1, 0));
 
 # Source type (plesk, cpanel, etc..)
 print &ui_table_row($text{'migrate_type'},

Diff for: modify-limits.pl

@@ -159,6 +159,12 @@ package virtual_server;
 	elsif ($a eq "--cannot-rename") {
 		$cannotrename = 1;
 		}
+	elsif ($a eq "--can-migrate") {
+		$canmigrate = 1;
+		}
+	elsif ($a eq "--cannot-migrate") {
+		$cannotmigrate = 1;
+		}
 	elsif ($a eq "--force-under") {
 		$forceunder = 1;
 		}
@@ -272,6 +278,8 @@ package virtual_server;
 		     $cannotdbname ? 1 : $dom->{'nodbname'};
 $dom->{'norename'} = $canrename ? 0 :
 		     $cannotrename ? 1 : $dom->{'norename'};
+$dom->{'migrate'} = $canmigrate ? 1 :
+		    $cannotmigrate ? 0 : $dom->{'migrate'};
 $dom->{'forceunder'} = $forceunder ? 1 :
 		       $noforceunder ? 0 : $dom->{'forceunder'};
 $dom->{'safeunder'} = $safeunder ? 1 :
@@ -329,6 +337,7 @@ sub usage
 print "                        [--max-aliases max|UNLIMITED]\n";
 print "                        [--can-dbname] | [--cannot-dbname]\n";
 print "                        [--can-rename] | [--cannot-rename]\n";
+print "                        [--can-migrate] | [--cannot-migrate]\n";
 print "                        [--force-under] | [--noforce-under]\n";
 print "                        [--safe-under] | [--nosafe-under]\n";
 print "                        [--ipfollow] | [--noipfollow]\n";

Diff for: plans-lib.pl

@@ -208,7 +208,7 @@ sub convert_plans
 	$plan->{'capabilities'} = $tmpl->{'capabilities'} eq 'none' ? '' :
 				   $tmpl->{'capabilities'};
 	foreach my $n ('nodbname', 'norename', 'forceunder', 'safeunder',
-		       'ipfollow') {
+		       'ipfollow', 'migrate') {
 		$plan->{$n} = $tmpl->{$n};
 		}
 	&save_plan($plan);
@@ -254,6 +254,7 @@ sub set_limits_from_plan
 $d->{'forceunder'} = $plan->{'forceunder'};
 $d->{'safeunder'} = $plan->{'safeunder'};
 $d->{'ipfollow'} = $plan->{'ipfollow'};
+$d->{'migrate'} = $plan->{'migrate'};
 }
 
 # set_reseller_limits_from_plan(&reseller, &plan)

Diff for: save_limits.cgi

@@ -31,6 +31,7 @@ $d->{'realdomslimit'} = $in{'realdomslimit_def'} == 1 ? undef
 		   				      : $in{'realdomslimit'};
 $d->{'nodbname'} = $in{'nodbname'};
 $d->{'norename'} = $in{'norename'};
+$d->{'migrate'} = $in{'migrate'};
 $d->{'forceunder'} = $in{'forceunder'};
 $d->{'safeunder'} = $in{'safeunder'};
 $d->{'ipfollow'} = $in{'ipfollow'};