From d13957c4d83c936424614d59262f5970dcd9b9ff Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 26 Jan 2019 15:01:30 +0100
Subject: [PATCH 01/13] Default uncheck DNS

---
 form/new_service.tform.php | 2 +-
 templates/new_service.htm  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/form/new_service.tform.php b/form/new_service.tform.php
index 21b9614..3738198 100644
--- a/form/new_service.tform.php
+++ b/form/new_service.tform.php
@@ -243,7 +243,7 @@ $form["tabs"]['client'] = array(
 		'dns' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
-			'default' => 'y',
+			'default' => 'n',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'dns_template_id' => array(
diff --git a/templates/new_service.htm b/templates/new_service.htm
index 4c64065..323cc85 100644
--- a/templates/new_service.htm
+++ b/templates/new_service.htm
@@ -177,6 +177,7 @@
 </div>
 
 <script type="text/javascript">
+	$(".dns").hide();
 	$("input[name=db]").change(function(){
 		if($(this).is(':checked'))
 		{
-- 
GitLab


From 55683426e24fe241685bb9c5e0a88aeb9e03280b Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 10 Apr 2019 21:45:00 +0200
Subject: [PATCH 02/13] Handle an existing client domain

Could exist as mail domain, using this to add a site.
---
 new_service.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/new_service.php b/new_service.php
index 918d5a3..b551e61 100644
--- a/new_service.php
+++ b/new_service.php
@@ -83,10 +83,21 @@ class page_action extends tform_actions {
 		global $app, $conf;
 
 		$fields = $app->tform->encode($this->dataRecord, $app->tform->getCurrentTab(), true);
+               $client_domain_exists = FALSE;
 
 		// check for domain unique name
-		if($app->db->queryOneRecord('SELECT domain_id FROM domain WHERE domain = "'.$fields['domain'].'"')) {
-			$app->tform->errorMessage = $app->tform->wordbook['domain_error_unique'];
+               if($app->db->queryOneRecord('SELECT domain_id FROM domain WHERE domain = ?', $fields['domain'])) {
+                       $client_domain_exists = TRUE;
+                       // Check use as web domain.
+                       if($app->db->queryOneRecord('SELECT domain_id FROM web_domain WHERE domain = ?', $fields['domain'])) {
+                               $app->tform->errorMessage = $app->tform->wordbook['domain_error_unique'] . 'b';
+                       }
+                       elseif($fields['mail'] && $app->db->queryOneRecord('SELECT domain_id FROM mail_domain WHERE domain = ?', $fields['domain'])) {
+                               $app->tform->errorMessage = $app->tform->wordbook['domain_error_unique']. 'a';
+                       }
+                       else {
+                               // Exists as client domain, not with a website.
+                       }
 		}
 		
 		if($app->tform->errorMessage)
@@ -114,7 +125,9 @@ class page_action extends tform_actions {
 		$client_group_id = $res['groupid'];
 		
 		// add domain
-		$domain_id = $remote->insert_query('../client/form/domain.tform.php', $fields['client_id'], array('domain' => $fields['domain']));
+               if (!$client_domain_exists) {
+                       $domain_id = $remote->insert_query('../client/form/domain.tform.php', $fields['client_id'], array('domain' => $fields['domain']));
+               }
 
 		$min_password_length = 8;
 		if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
-- 
GitLab


From 70c5921652d5feb0d1ed55099a75ad7a136244fe Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 11 Apr 2019 08:55:39 +0200
Subject: [PATCH 03/13] Add plain text summary

---
 new_service.php                          | 20 ++++++++++++++++++++
 templates/template_summary_plaintext.htm | 15 +++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 templates/template_summary_plaintext.htm

diff --git a/new_service.php b/new_service.php
index b551e61..d4945c2 100644
--- a/new_service.php
+++ b/new_service.php
@@ -643,6 +643,26 @@ class page_action extends tform_actions {
 			</table>
 			</div>
 		';
+
+               // Loading the template
+               $app->uses('tpl');
+               $app->tpl->newTemplate("templates/template_summary_plaintext.htm");
+
+               $app->tpl->setVar('sitedomain', $fields['domain']);
+               $app->tpl->setVar('database_username', $db_user_params['database_user']);
+               $app->tpl->setVar('database_password', $db_user_params['database_password']);
+
+               $app->tpl->setVar('ftp_server_name', $webserver['server_name']);
+               $app->tpl->setVar('ftp_username', $ftp_params['username']);
+               $app->tpl->setVar('ftp_password', $ftp_params['password']);
+
+               $app->tpl->setVar('ssh_server_name', $webserver['server_name']);
+               $app->tpl->setVar('ssh_username', $ssh_params['username']);
+               $app->tpl->setVar('ssh_password', $ssh_params['password']);
+               // TODO
+//             $app->tpl->setVar('mailbox_passwords', $mailbox_passwords);
+
+               $app->tpl->pparse();
 	}
 
 	private function clean_private_key($key)
diff --git a/templates/template_summary_plaintext.htm b/templates/template_summary_plaintext.htm
new file mode 100644
index 0000000..f842edd
--- /dev/null
+++ b/templates/template_summary_plaintext.htm
@@ -0,0 +1,15 @@
+<pre>
+Site: {tmpl_var name='sitedomain'}
+
+DB name/user   {tmpl_var name='database_user'}
+DB password    {tmpl_var name='database_password'}
+PhpMyAdmin     https://{tmpl_var name='ssh_server_name]'}/phpmyadmin/
+
+FTP Server     {tmpl_var name='ftp_server_name]'}
+FTP user       {tmpl_var name='ftp_username'}
+FTP password   {tmpl_var name='ftp_password'}
+
+SSH Server     {tmpl_var name='ssh_server_name]'}
+SSH user       {tmpl_var name='ssh_username'}
+SSH password   {tmpl_var name='ssh_password'}
+</pre>
-- 
GitLab


From 9ac442a36b86d199abec2c4160c5e5330468236d Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 8 May 2019 14:57:37 +0200
Subject: [PATCH 04/13] template improvement

---
 new_service.php                          |  8 +++++---
 templates/template_summary_plaintext.htm | 12 +++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/new_service.php b/new_service.php
index d4945c2..88101b4 100644
--- a/new_service.php
+++ b/new_service.php
@@ -652,9 +652,11 @@ class page_action extends tform_actions {
                $app->tpl->setVar('database_username', $db_user_params['database_user']);
                $app->tpl->setVar('database_password', $db_user_params['database_password']);
 
-               $app->tpl->setVar('ftp_server_name', $webserver['server_name']);
-               $app->tpl->setVar('ftp_username', $ftp_params['username']);
-               $app->tpl->setVar('ftp_password', $ftp_params['password']);
+               if(isset($ftp_params)) {
+                       $app->tpl->setVar('ftp_server_name', $webserver['server_name']);
+                       $app->tpl->setVar('ftp_username', $ftp_params['username']);
+                       $app->tpl->setVar('ftp_password', $ftp_params['password']);
+               }
 
                $app->tpl->setVar('ssh_server_name', $webserver['server_name']);
                $app->tpl->setVar('ssh_username', $ssh_params['username']);
diff --git a/templates/template_summary_plaintext.htm b/templates/template_summary_plaintext.htm
index f842edd..f071fc7 100644
--- a/templates/template_summary_plaintext.htm
+++ b/templates/template_summary_plaintext.htm
@@ -1,15 +1,21 @@
 <pre>
 Site: {tmpl_var name='sitedomain'}
 
+<tmpl_if name="database_user">
 DB name/user   {tmpl_var name='database_user'}
 DB password    {tmpl_var name='database_password'}
-PhpMyAdmin     https://{tmpl_var name='ssh_server_name]'}/phpmyadmin/
+PhpMyAdmin     https://{tmpl_var name='ssh_server_name'}/phpmyadmin/
+</tmpl_if>
 
-FTP Server     {tmpl_var name='ftp_server_name]'}
+<tmpl_if name="ftp_server_name">
+FTP Server     {tmpl_var name='ftp_server_name'}
 FTP user       {tmpl_var name='ftp_username'}
 FTP password   {tmpl_var name='ftp_password'}
+</tmpl_if>
 
-SSH Server     {tmpl_var name='ssh_server_name]'}
+<tmpl_if name="ssh_server_name">
+SSH Server     {tmpl_var name='ssh_server_name'}
 SSH user       {tmpl_var name='ssh_username'}
 SSH password   {tmpl_var name='ssh_password'}
+</tmpl_if>
 </pre>
-- 
GitLab


From 325e33ce8f95b9554a09b84f72e1cd66a017e304 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 19 Aug 2020 11:07:15 +0200
Subject: [PATCH 05/13] Fix template var name

---
 templates/template_summary_plaintext.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/template_summary_plaintext.htm b/templates/template_summary_plaintext.htm
index f071fc7..6044a52 100644
--- a/templates/template_summary_plaintext.htm
+++ b/templates/template_summary_plaintext.htm
@@ -1,8 +1,8 @@
 <pre>
 Site: {tmpl_var name='sitedomain'}
 
-<tmpl_if name="database_user">
-DB name/user   {tmpl_var name='database_user'}
+<tmpl_if name="database_username">
+DB name/user   {tmpl_var name='database_username'}
 DB password    {tmpl_var name='database_password'}
 PhpMyAdmin     https://{tmpl_var name='ssh_server_name'}/phpmyadmin/
 </tmpl_if>
-- 
GitLab


From 72502f3b0a47f73561e45ced77a781de66598507 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 21 Aug 2020 16:17:40 +0200
Subject: [PATCH 06/13] Move SSH info higher

---
 templates/template_summary_plaintext.htm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/template_summary_plaintext.htm b/templates/template_summary_plaintext.htm
index 6044a52..de7e52c 100644
--- a/templates/template_summary_plaintext.htm
+++ b/templates/template_summary_plaintext.htm
@@ -1,6 +1,12 @@
 <pre>
 Site: {tmpl_var name='sitedomain'}
 
+<tmpl_if name="ssh_username">
+SFTP/SSH Server     {tmpl_var name='ssh_server_name'}
+SSH user       {tmpl_var name='ssh_username'}
+SSH password   {tmpl_var name='ssh_password'}
+</tmpl_if>
+
 <tmpl_if name="database_username">
 DB name/user   {tmpl_var name='database_username'}
 DB password    {tmpl_var name='database_password'}
@@ -13,9 +19,4 @@ FTP user       {tmpl_var name='ftp_username'}
 FTP password   {tmpl_var name='ftp_password'}
 </tmpl_if>
 
-<tmpl_if name="ssh_server_name">
-SSH Server     {tmpl_var name='ssh_server_name'}
-SSH user       {tmpl_var name='ssh_username'}
-SSH password   {tmpl_var name='ssh_password'}
-</tmpl_if>
 </pre>
-- 
GitLab


From a8a9403175e7e0d9d759f1fcf70e5fd114171b4d Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 23 Aug 2020 21:25:16 +0200
Subject: [PATCH 07/13] Doc update

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 79e7c6a..0e0ddd4 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,16 @@ This module is compatible with ISPConfig version 3.1
 
 ## Installation
 
-This module have to be installed on master node in multiserver setup.
+This module has to be installed on master node in multiserver setup.
 
 - Download this repo as archive, unpack it to `/usr/local/ispconfig/interface/web/` and rename forlder to `wizard` OR  
 clone repo using git `git clone https://git.ispconfig.org/ispconfig/module-wizard.git /usr/local/ispconfig/interface/web/wizard`
 - Create DB table provided in db.sql file `mysql -u root -p < db.sql`
 - Enable module in user interface System -> CP Users -> Admin user -> Check "wizard" and save.
   - If it doesn't work, enable module manually by editing admin user in DB table `sys_user` column `modules`
-  
+
+On a slave server you only have to create the database table using the instructions above.
+
 ## Planned features
 
 - Export results as PDF
-- 
GitLab


From 2cedc031333c2f7d18107a0f9678e5d8fa7b0765 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 17 Sep 2020 11:04:24 +0200
Subject: [PATCH 08/13] Add initial db updated for ISPconfig 3.2b1

---
 db.sql            | 14 ++++++++++++++
 db_update_3.2.sql | 21 +++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 db_update_3.2.sql

diff --git a/db.sql b/db.sql
index dfeb121..8589f82 100644
--- a/db.sql
+++ b/db.sql
@@ -62,6 +62,7 @@ CREATE TABLE `wizard_template` (
   `http_port` int(11) NOT NULL DEFAULT '80',
   `https_port` int(11) NOT NULL DEFAULT '443',
   `log_retention` int(11) NOT NULL DEFAULT '30',
+  `proxy_protocol` ENUM('n','y') NOT NULL DEFAULT 'n',
   `apache_directives` mediumtext,
   `nginx_directives` mediumtext,
   `php_fpm_use_socket` enum('n','y') NOT NULL DEFAULT 'n',
@@ -74,6 +75,13 @@ CREATE TABLE `wizard_template` (
   `pm_process_idle_timeout` int(11) unsigned NOT NULL DEFAULT '10',
   `pm_max_requests` int(11) unsigned NOT NULL DEFAULT '0',
   `custom_php_ini` mediumtext,
+  `backup_interval` varchar(255) NOT NULL DEFAULT 'none',
+  `backup_copies` int(11) NOT NULL DEFAULT 1,
+  `backup_format_web` varchar(255) NOT NULL DEFAULT 'default',
+  `backup_format_db` varchar(255) NOT NULL DEFAULT 'gzip',
+  `backup_encrypt` enum('n','y') NOT NULL DEFAULT 'n',
+  `backup_password` varchar(255) NOT NULL DEFAULT '',
+  `backup_excludes` mediumtext DEFAULT NULL,
   `database_charset` varchar(64) DEFAULT NULL,
   `database_remote_access` enum('n','y') NOT NULL DEFAULT 'n',
   `database_remote_ips` text,
@@ -90,3 +98,9 @@ CREATE TABLE `wizard_template` (
   `enablepop3` enum('n','y') NOT NULL DEFAULT 'y',
   PRIMARY KEY (`template_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+ALTER TABLE `wizard_template`
+    ADD COLUMN `proxy_protocol` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `log_retention`;
+
+ALTER TABLE `wizard_template`
+		ADD COLUMN `server_php_id` int(11) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/db_update_3.2.sql b/db_update_3.2.sql
new file mode 100644
index 0000000..1c56476
--- /dev/null
+++ b/db_update_3.2.sql
@@ -0,0 +1,21 @@
+
+ALTER TABLE `wizard_template`
+    ADD COLUMN `proxy_protocol` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `log_retention`;
+ALTER TABLE `wizard_template`
+		ADD COLUMN `server_php_id` int(11) UNSIGNED NOT NULL DEFAULT 0;
+
+
+ALTER TABLE `wizard_template` ADD `backup_interval` varchar(255) NOT NULL DEFAULT 'none' AFTER `custom_php_ini`;
+ALTER TABLE `wizard_template` ADD `backup_copies` int(11) NOT NULL DEFAULT 1 AFTER `backup_interval`;
+
+-- backup format
+ALTER TABLE `wizard_template` ADD  `backup_format_web` VARCHAR( 255 ) NOT NULL default 'default' AFTER `backup_copies`;
+ALTER TABLE `wizard_template` ADD  `backup_format_db` VARCHAR( 255 ) NOT NULL default 'gzip' AFTER `backup_format_web`;
+-- end of backup format
+
+-- backup encryption
+ALTER TABLE `wizard_template` ADD  `backup_encrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `backup_format_db`;
+ALTER TABLE `wizard_template` ADD  `backup_password` VARCHAR( 255 ) NOT NULL DEFAULT '' AFTER `backup_encrypt`;
+-- end of backup encryption
+
+ALTER TABLE `wizard_template` ADD `backup_excludes` mediumtext DEFAULT NULL AFTER `backup_password`;
-- 
GitLab


From 25e4239054a3e9d39604321603534d9dc0e23f33 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 17 Sep 2020 11:22:19 +0200
Subject: [PATCH 09/13] merge fix

---
 new_service.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/new_service.php b/new_service.php
index 88101b4..c2da805 100644
--- a/new_service.php
+++ b/new_service.php
@@ -563,7 +563,8 @@ class page_action extends tform_actions {
 			$remote->insert_query('../sites/form/shell_user.tform.php', $fields['client_id'], $ssh_params);
 		}
 
-        $dbserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['database_server_id']);
+		$dbserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['database_server_id']);
+		$webserver = $app->db->queryOneRecord("SELECT server_name FROM server WHERE web_server = 1 AND server_id = ?", $template['web_server_id']);
 
 		$global_config = $app->getconf->get_global_config('sites');
 		$phpmyadmin_url = $global_config['phpmyadmin_url'];
@@ -593,7 +594,7 @@ class page_action extends tform_actions {
 					<tr>
 						<td>'.$db_user_params['database_user'].'</td>
 						<td>'.$db_user_params['database_password'].'</td>
-                                               <td>'.$phpmyadmin_url.'</td>
+						<td>'.$phpmyadmin_url.'</td>
 					</tr>';
 				}
 				if(isset($ftp_params)) {
@@ -614,12 +615,12 @@ class page_action extends tform_actions {
 					<tr class="info">
 						<th>SSH user</th>
 						<th>SSH password</th>
-                                               <th>SSH Server</th>
+						<th>SSH Server</th>
 					</tr>
 					<tr>
 						<td>'.$ssh_params['username'].'</td>
 						<td>'.$ssh_params['password'].'</td>
-                                               <td>'.$webserver['server_name'].'</td>
+						<td>'.$webserver['server_name'].'</td>
 					</tr>';
 				}
 				if(isset($mailbox_passwords) and (bool)count($mailbox_passwords))
-- 
GitLab


From e88a295700cc5a4c2f603f8151caa592e7cbad56 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 17 Sep 2020 11:49:18 +0200
Subject: [PATCH 10/13] Add Auto-subdomain to wizzard form

---
 form/new_service.tform.php  | 11 ++++++++++-
 lib/lang/cz_new_service.lng |  5 ++++-
 lib/lang/en_new_service.lng |  5 ++++-
 lib/lang/es_new_service.lng |  3 +++
 new_service.php             |  2 +-
 templates/new_service.htm   |  8 ++++++++
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/form/new_service.tform.php b/form/new_service.tform.php
index 3738198..9d42a8b 100644
--- a/form/new_service.tform.php
+++ b/form/new_service.tform.php
@@ -79,6 +79,9 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
 $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
+// Admin always right?
+$wildcard_available = TRUE;
+
 $form["tabs"]['client'] = array(
 	'title'  => "New service",
 	'description' => 'Create domain, mail domain, site, database and ftp/ssh',
@@ -161,6 +164,12 @@ $form["tabs"]['client'] = array(
 			),
 			'value'  => '',	
 		),
+		'subdomain' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => 'template',
+			'value'  => ($wildcard_available ? array('template' => 'use_template_txt', 'none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
+		),
 		'db' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
@@ -258,4 +267,4 @@ $form["tabs"]['client'] = array(
 			'value'  => '',	
 		),
 	)
-);
\ No newline at end of file
+);
diff --git a/lib/lang/cz_new_service.lng b/lib/lang/cz_new_service.lng
index 0166b69..d96c56b 100644
--- a/lib/lang/cz_new_service.lng
+++ b/lib/lang/cz_new_service.lng
@@ -45,4 +45,7 @@ $wb['error_email_empty'] = 'Email prázdné.';
 $wb['error_domain_regex'] = 'Doména obsahuje neplatné znaky.';
 $wb['error_ns1_regex'] = 'NS1 obsahuje neplatné znaky.';
 $wb['error_ns2_regex'] = 'NS2 obsahuje neplatné znaky.';
-$wb['error_email_regex'] = 'Email neosahuje platnou emailovou adresu.';
\ No newline at end of file
+$wb['error_email_regex'] = 'Email neosahuje platnou emailovou adresu.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['none_txt'] = 'None';
+$wb['use_template_txt'] = 'Use template value';
diff --git a/lib/lang/en_new_service.lng b/lib/lang/en_new_service.lng
index c7013fd..7ef5238 100644
--- a/lib/lang/en_new_service.lng
+++ b/lib/lang/en_new_service.lng
@@ -46,4 +46,7 @@ $wb['error_email_empty'] = 'Email empty.';
 $wb['error_domain_regex'] = 'Domain contains invalid characters.';
 $wb['error_ns1_regex'] = 'NS1 contains invalid characters.';
 $wb['error_ns2_regex'] = 'NS2 contains invalid characters.';
-$wb['error_email_regex'] = 'Email does not contain a valid email address.';
\ No newline at end of file
+$wb['error_email_regex'] = 'Email does not contain a valid email address.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['none_txt'] = 'None';
+$wb['use_template_txt'] = 'Use template value';
diff --git a/lib/lang/es_new_service.lng b/lib/lang/es_new_service.lng
index 53ae9ea..252d146 100644
--- a/lib/lang/es_new_service.lng
+++ b/lib/lang/es_new_service.lng
@@ -45,3 +45,6 @@ $wb['error_domain_regex'] = 'El dominio contiene caracteres erroneos.';
 $wb['error_ns1_regex'] = 'NS1 contiene caracteres erroneos.';
 $wb['error_ns2_regex'] = 'NS2 contiene caracteres erroneos.';
 $wb['error_email_regex'] = 'El Email no contiene una direccion valida.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['none_txt'] = 'None';
+$wb['use_template_txt'] = 'Use template value';
diff --git a/new_service.php b/new_service.php
index c2da805..6c15ada 100644
--- a/new_service.php
+++ b/new_service.php
@@ -412,7 +412,7 @@ class page_action extends tform_actions {
 			'python' => $template['python'],
 			'perl' => $template['perl'],
 			'errordocs' => $template['errordocs'],
-			'subdomain' => $template['subdomain'],
+			'subdomain' => $fields['subdomain'] == 'template' ? $template['subdomain'] : $fields['subdomain'],
 			'php' => $template['php'],
 			'fastcgi_php_version' => $template['fastcgi_php_version'],
 			'seo_redirect' => $template['seo_redirect'],
diff --git a/templates/new_service.htm b/templates/new_service.htm
index 323cc85..3143241 100644
--- a/templates/new_service.htm
+++ b/templates/new_service.htm
@@ -33,6 +33,14 @@
     </div>
 </div>
 
+<div class="form-group">
+	<label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
+	<div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
+		{tmpl_var name='subdomain'}
+	</select></div>
+</div>
+
+
 <div class="form-group">
     <label class="col-sm-3 control-label">{tmpl_var name='db_txt'}</label>
     <div class="col-sm-9">
-- 
GitLab


From 6239d80f8c8d7c4fd74718e29bd6039ca84f1077 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 3 Sep 2021 15:45:08 +0200
Subject: [PATCH 11/13] Add new columns

---
 db.sql            | 7 +++++++
 db_update_3.2.sql | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/db.sql b/db.sql
index 8589f82..879ee9a 100644
--- a/db.sql
+++ b/db.sql
@@ -104,3 +104,10 @@ ALTER TABLE `wizard_template`
 
 ALTER TABLE `wizard_template`
 		ADD COLUMN `server_php_id` int(11) UNSIGNED NOT NULL DEFAULT 0;
+
+ALTER TABLE `wizard_template` ADD  `jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `jailkit_chroot_app_programs` mediumtext NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `delete_unused_jailkit` enum('n','y') NOT NULL DEFAULT 'n';
+ALTER TABLE `wizard_template` ADD  `last_jailkit_update` date NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `last_jailkit_hash` varchar(255) DEFAULT NULL;
+
diff --git a/db_update_3.2.sql b/db_update_3.2.sql
index 1c56476..9bce5ef 100644
--- a/db_update_3.2.sql
+++ b/db_update_3.2.sql
@@ -19,3 +19,10 @@ ALTER TABLE `wizard_template` ADD  `backup_password` VARCHAR( 255 ) NOT NULL DEF
 -- end of backup encryption
 
 ALTER TABLE `wizard_template` ADD `backup_excludes` mediumtext DEFAULT NULL AFTER `backup_password`;
+
+ALTER TABLE `wizard_template` ADD  `jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `jailkit_chroot_app_programs` mediumtext NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `delete_unused_jailkit` enum('n','y') NOT NULL DEFAULT 'n';
+ALTER TABLE `wizard_template` ADD  `last_jailkit_update` date NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` ADD  `last_jailkit_hash` varchar(255) DEFAULT NULL;
+
-- 
GitLab


From e589cdff04c2dd0782bd03174da94d2882febd74 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 22 Nov 2021 09:37:45 +0100
Subject: [PATCH 12/13] Add more new columns

---
 db_update_3.2.sql | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/db_update_3.2.sql b/db_update_3.2.sql
index 9bce5ef..027f9c6 100644
--- a/db_update_3.2.sql
+++ b/db_update_3.2.sql
@@ -26,3 +26,12 @@ ALTER TABLE `wizard_template` ADD  `delete_unused_jailkit` enum('n','y') NOT NUL
 ALTER TABLE `wizard_template` ADD  `last_jailkit_update` date NULL DEFAULT NULL;
 ALTER TABLE `wizard_template` ADD  `last_jailkit_hash` varchar(255) DEFAULT NULL;
 
+-- Match incremental/upd_0091.sql
+ALTER TABLE `wizard_template` ALTER pm SET DEFAULT 'ondemand';
+ALTER TABLE `wizard_template` DROP COLUMN `enable_spdy`;
+ALTER TABLE `wizard_template` ADD `folder_directive_snippets` TEXT NULL AFTER `https_port`;
+ALTER TABLE `wizard_template` CHANGE `apache_directives` `apache_directives` mediumtext NULL DEFAULT NULL;
+ALTER TABLE `wizard_template` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
+
+-- Match incremental/upd_0092.sql
+ALTER TABLE `wizard_template` DROP COLUMN `fastcgi_php_version`;
-- 
GitLab


From 5d765df826b4905b88dac33d765baee2b93c9b6c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 15 Jan 2022 22:40:33 +0100
Subject: [PATCH 13/13] Fix username_prefix

---
 new_service.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/new_service.php b/new_service.php
index 6c15ada..176c378 100644
--- a/new_service.php
+++ b/new_service.php
@@ -513,7 +513,7 @@ class page_action extends tform_actions {
 				'server_id' => 	$template['web_server_id'],
 				'parent_domain_id' => $site_id,
 				'username' => $client_ftp_prefix . $generated_username,
-				'username_prefix' => $client_prefix,
+				'username_prefix' => $client_ftp_prefix,
 				'password' => $app->auth->get_random_password($min_password_length, true),
 				'quota_size' => $template['hd_quota'],
 				'dir' => $site_data['document_root'],
@@ -550,7 +550,7 @@ class page_action extends tform_actions {
 				'shell' => $template['shell'],
 				'active' => 'y',
 				'username' => $client_shell_prefix . $generated_username,
-				'username_prefix' => $client_prefix,
+				'username_prefix' => $client_shell_prefix,
 			);
 			
 			// username, password
-- 
GitLab