Add ability to control default website page from templates 4/4

* Consider template options when creating domain using CLI

Author: iliajie

Diff for: api-create-domain-lib.pl

@@ -4,7 +4,8 @@
 no warnings 'uninitialized';
 
 our (%config, %text, @features, @aliasmail_features, @alias_features,
-     @opt_subdom_features, @banned_usernames, $first_print, $second_print);
+     @opt_subdom_features, @banned_usernames, $first_print, $second_print,
+     $virtualmin_pro);
 
 # create_domain_cli(domain-name, &opts)
 # This sub is fully compatible with the ‘create-domain.pl’ API. Returns an error
@@ -948,6 +949,21 @@ sub create_domain_cli
 		}
 	}
 
+# Content can come from template
+if (!defined($content)) {
+	my $content_web_tmpl = $tmpl->{'content_web'};
+	my $content_web_tmpl_html_file = $tmpl->{'content_web_html'};
+	# Default HTML page
+	if ($content_web_tmpl == 2) {
+		$content = "";
+		}
+	# Want to set content to the given from file
+	elsif (!$content_web_tmpl && $virtualmin_pro &&
+		-r $content_web_tmpl_html_file) {
+		$content = &read_file_contents($content_web_tmpl_html_file);
+		}
+	}
+
 # Do it
 &lock_domain(\%dom);
 $config{'pre_command'} = $precommand if ($precommand);

Diff for: create-domain.pl

@@ -1017,6 +1017,21 @@ package virtual_server;
 		}
 	}
 
+# Content can come from template
+if (!defined($content)) {
+	my $content_web_tmpl = $tmpl->{'content_web'};
+	my $content_web_tmpl_html_file = $tmpl->{'content_web_html'};
+	# Default HTML page
+	if ($content_web_tmpl == 2) {
+		$content = "";
+		}
+	# Want to set content to the given from file
+	elsif (!$content_web_tmpl && $virtualmin_pro &&
+		-r $content_web_tmpl_html_file) {
+		$content = &read_file_contents($content_web_tmpl_html_file);
+		}
+	}
+
 # Do it
 print "Beginning server creation ..\n\n";
 &lock_domain(\%dom);