From c31bea497a2fa59fc30ebb9b42402b241ee72068 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/12] 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 aed530f..9d42a8b 100644
--- a/form/new_service.tform.php
+++ b/form/new_service.tform.php
@@ -252,7 +252,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 8c6db52..3143241 100644
--- a/templates/new_service.htm
+++ b/templates/new_service.htm
@@ -185,6 +185,7 @@
 </div>
 
 <script type="text/javascript">
+	$(".dns").hide();
 	$("input[name=db]").change(function(){
 		if($(this).is(':checked'))
 		{
-- 
GitLab


From a0b5bea4fa013ef9d1a6ace74eb733462c3597d3 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/12] 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 c1243aa..6620505 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 df7e1b11fdc442b6d7c50143f01d44a5e84f64f0 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/12] 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 6620505..6067c0d 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 1478bd4243c18fbc8aab975f673385ce153b83be 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/12] 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 6067c0d..bbee207 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 fe04cbc99eda509d921d70f76acf1b87101a00f6 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/12] 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 e9fed1a4761af48fb91e2ecf039db57a5e616732 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/12] 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 d6f9c84307af7c33a59f01f08cdd95829b3347fc 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/12] 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 724422a9a288936198a0e2a08d6b4f6d09e3c92c 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/12] Add initial db updated for ISPconfig 3.2b1

---
 db.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/db.sql b/db.sql
index 59177d9..2bb7feb 100644
--- a/db.sql
+++ b/db.sql
@@ -102,3 +102,9 @@ CREATE TABLE `wizard_template` (
   `delete_unused_jailkit` enum('n','y') NOT NULL DEFAULT 'n',
   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;
-- 
GitLab


From a5cd731dcdfec1b64738b4cd4dc68ea1c58b16a7 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/12] merge fix

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

diff --git a/new_service.php b/new_service.php
index bbee207..6c15ada 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 230b2165500a92678e49bcaa6afa3315115e192a 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 10/12] 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 2bb7feb..5347465 100644
--- a/db.sql
+++ b/db.sql
@@ -108,3 +108,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 291ecc6f1339b5f14cc0d9e4bc7793dd544aca82 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 11/12] 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 a7fffb7e1cd4c6036f391af06cb8d0e0e7ee4cc2 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 12/12] 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