Merge branch 'release/1.0.1'

e2765d41 · Kristián Feldsam · b1882018 · cb9b58e8 · e2765d41 · e2765d41
Commit e2765d41 authored Jul 21, 2016 by Kristián Feldsam
24 changed files
--- a/.gitignore
+++ b/.gitignore
+.DS_Store
\ No newline at end of file
--- a/README.md
+++ b/README.md
+#ISPConfig Wizard module
+
+This module allows you to create DNS Zone, Site, Database User, Database, FTP User, SSH User, Mail Domain and Mailboxes in one form. You just define domain name and using checkboxes decide which services you want to create. Services are created using user defined templates.
+
+This module is compatible with ISPConfig version 3.1
+
+##Installation
+
+This module have to be installed on master node in multiserver setup.
+
+- Download this repo as archive, unpack it to `/usr/local/ispconfig/interface/web/`
+- 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`
+  
+##Changelog
+
+###Version 1.0.1
+
+Release date: July 21 2016
+
+First publicly released version.
+
+##Planned features
+
+- Export results as PDF
+- Email results as HTML/PDF
+
+##Screenshots
+
+![New service](https://git.ispconfig.org/ispconfig/module-wizard/raw/master/readme_images/new_service.png)
+
+![Template](https://git.ispconfig.org/ispconfig/module-wizard/raw/master/readme_images/template.png)
+
+##Contributing
+
+Contributions are welcome. Our release model uses [Git Flow approach](http://danielkummer.github.io/git-flow-cheatsheet/), so you have to base your branches on `develop` and should have name `feature/name-of-feature` or `hotfix/name-of-hotfix`.
+
+Please contribute your translations, which are located in `lib/lang/` directory. Thank you.
+
+##License
+
+Copyright (c) 2016, Kristián Feldsam, FELDSAM s.r.o. <info@feldsam.cz>  
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,  
+are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,  
+      this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,  
+      this list of conditions and the following disclaimer in the documentation  
+      and/or other materials provided with the distribution.
+- Neither the name of ISPConfig nor the names of its contributors  
+      may be used to endorse or promote products derived from this software without  
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND  
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED  
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,  
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,  
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,  
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY  
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING  
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/db.sql
+++ b/db.sql
+/*
+Copyright (c) 2016, Kristián Feldsam, FELDSAM s.r.o. <info@feldsam.cz>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+USE `dbispconfig`;
+
+CREATE TABLE `wizard_template` (
+  `template_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+  `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+  `sys_perm_user` varchar(5) DEFAULT NULL,
+  `sys_perm_group` varchar(5) DEFAULT NULL,
+  `sys_perm_other` varchar(5) DEFAULT NULL,
+  `web_server_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `mail_server_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `database_server_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `dns_server_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `template_name` varchar(255) NOT NULL DEFAULT '',
+  `ip_address` varchar(39) DEFAULT NULL,
+  `ipv6_address` varchar(255) DEFAULT NULL,
+  `traffic_quota` bigint(20) NOT NULL DEFAULT '-1',
+  `hd_quota` bigint(20) NOT NULL DEFAULT '-1',
+  `database_quota` int(11) unsigned DEFAULT NULL,
+  `mailbox_quota` int(11) unsigned DEFAULT NULL,
+  `cgi` enum('n','y') NOT NULL DEFAULT 'n',
+  `ssi` enum('n','y') NOT NULL DEFAULT 'n',
+  `suexec` enum('n','y') NOT NULL DEFAULT 'y',
+  `errordocs` tinyint(1) NOT NULL DEFAULT '1',
+  `subdomain` enum('none','www','*') NOT NULL DEFAULT 'www',
+  `php` varchar(32) NOT NULL DEFAULT 'fast-cgi',
+  `fastcgi_php_version` varchar(255) DEFAULT NULL,
+  `ruby` enum('n','y') NOT NULL DEFAULT 'n',
+  `python` enum('n','y') NOT NULL DEFAULT 'n',
+  `perl` enum('n','y') NOT NULL DEFAULT 'n',
+  `seo_redirect` varchar(255) DEFAULT NULL,
+  `rewrite_to_https` enum('n','y') NOT NULL DEFAULT 'n',
+  `allow_override` varchar(255) NOT NULL DEFAULT 'All',
+  `http_port` int(11) NOT NULL DEFAULT '80',
+  `https_port` int(11) NOT NULL DEFAULT '443',
+  `apache_directives` mediumtext,
+  `nginx_directives` mediumtext,
+  `php_fpm_use_socket` enum('n','y') NOT NULL DEFAULT 'n',
+  `pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
+  `pm_max_children` int(11) unsigned NOT NULL DEFAULT '10',
+  `pm_start_servers` int(11) unsigned NOT NULL DEFAULT '2',
+  `pm_min_spare_servers` int(11) unsigned NOT NULL DEFAULT '1',
+  `pm_max_spare_servers` int(11) unsigned NOT NULL DEFAULT '5',
+  `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,
+  `database_charset` varchar(64) DEFAULT NULL,
+  `database_remote_access` enum('n','y') NOT NULL DEFAULT 'n',
+  `database_remote_ips` text,
+  `policy` int(11) unsigned NOT NULL DEFAULT '0',
+  `dkim` enum('n','y') NOT NULL DEFAULT 'n',
+  `dkim_selector` varchar(63) NOT NULL DEFAULT 'default',
+  `quota_files` bigint(20) NOT NULL DEFAULT '-1',
+  `ul_ratio` int(11) NOT NULL DEFAULT '-1',
+  `dl_ratio` int(11) NOT NULL DEFAULT '-1',
+  `ul_bandwidth` int(11) NOT NULL DEFAULT '-1',
+  `dl_bandwidth` int(11) NOT NULL DEFAULT '-1',
+  `shell` varchar(255) NOT NULL DEFAULT '/bin/bash',
+  `shell_chroot` varchar(255) NOT NULL DEFAULT '',
+  `enablesmtp` enum('n','y') NOT NULL DEFAULT 'y',
+  `enableimap` enum('n','y') NOT NULL DEFAULT 'y',
+  `enablepop3` enum('n','y') NOT NULL DEFAULT 'y',
+  PRIMARY KEY (`template_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
--- a/form/new_service.tform.php
+++ b/form/new_service.tform.php
+<?php
+/*
+Copyright (c) 2016, Kristián Feldsam, FELDSAM s.r.o. <info@feldsam.cz>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	Form Definition
+
+	Tabledefinition
+
+	Datatypes:
+	- INTEGER (Forces the input to Int)
+	- DOUBLE
+	- CURRENCY (Formats the values to currency notation)
+	- VARCHAR (no format check, maxlength: 255)
+	- TEXT (no format check)
+	- DATE (Dateformat, automatic conversion to timestamps)
+
+	Formtype:
+	- TEXT (Textfield)
+	- TEXTAREA (Textarea)
+	- PASSWORD (Password textfield, input is not shown when edited)
+	- SELECT (Select option field)
+	- RADIO
+	- CHECKBOX
+	- CHECKBOXARRAY
+	- FILE
+
+	VALUE:
+	- Wert oder Array
+
+	Hint:
+	The ID field of the database table is not part of the datafield definition.
+	The ID field must be always auto incement (int or bigint).
+
+	Search:
+	- searchable = 1 or searchable = 2 include the field in the search
+	- searchable = 1: this field will be the title of the search result
+	- searchable = 2: this field will be included in the description of the search result
+
+
+*/
+
+$form["title"]    = "New service wizard";
+$form["description"]  = "";
+$form["name"]    = "new_service";
+$form["action"]   = "new_service.php";
+$form["db_table"]  = "wizard_template";
+$form["db_table_idx"] = "template_id";
+$form["db_history"]  = "no";
+$form["tab_default"] = "client";
+$form["auth"]   = 'yes'; // yes / no
+
+$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
+$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
+$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
+$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
+
+$form["tabs"]['client'] = array(
+	'title'  => "New service",
+	'description' => 'Create domain, mail domain, site, database and ftp/ssh',
+	'width'  => 100,
+	'template'  => "templates/new_service.htm",
+	'fields'  => array (
+		'domain' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'filters'   => array(
+				0 => array( 'event' => 'SAVE',
+					'type' => 'IDNTOASCII'),
+				1 => array( 'event' => 'SHOW',
+					'type' => 'IDNTOUTF8'),
+				2 => array( 'event' => 'SAVE',
+					'type' => 'TOLOWER')
+			),
+			'validators' => array (
+				0 => array ( 'type' => 'NOTEMPTY',
+					'errmsg'=> 'domain_error_empty'),
+				2 => array ( 'type' => 'REGEX',
+					'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
+					'errmsg'=> 'domain_error_regex'),
+			),
+			'default' => '',
+			'value'  => '',
+			'width'  => '30',
+			'maxlength' => '255'
+		),
+		'client_id' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '',
+			'datasource' => array (  'type' => 'SQL',
+				'querystring' => "SELECT sys_group.groupid, sys_group.client_id, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name",
+				'keyfield'=> 'client_id',
+				'valuefield'=> 'contactname'
+			),
+			'value'  => ''
+		),
+		'template_id' => array(
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '',
+			'datasource' => array (  'type' => 'SQL',
+				'querystring' => 'SELECT template_id, template_name FROM wizard_template WHERE {AUTHSQL} ORDER BY template_name',
+				'keyfield'=> 'template_id',
+				'valuefield'=> 'template_name'
+			),
+			'value'  => '',	
+		),
+		'db' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'db_type' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => 'mysql',
+			'value'  => array(
+				//'mongo' => 'MongoDB',
+				'mysql' => 'MySQL'
+			)
+		),
+		'ftp' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'ssh' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'mail' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'mailboxes' => array (
+			'datatype' => 'TEXT',
+			'formtype' => 'TEXTAREA',
+			'default' => '',
+			'value'  => '',
+			'width'  => '30',
+		),
+		'dns' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		'dns_template_id' => array(
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '',
+			'datasource' => array (  'type' => 'SQL',
+				'querystring' => "SELECT template_id, name FROM dns_template WHERE visible = 'Y' ORDER BY name ASC",
+				'keyfield'=> 'template_id',
+				'valuefield'=> 'name'
+			),
+			'value'  => '',	
+		),
+	)
+);
\ No newline at end of file
--- a/form/template.tform.php
+++ b/form/template.tform.php
+<?php
+/*
+Copyright (c) 2016, Kristián Feldsam, FELDSAM s.r.o. <info@feldsam.cz>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	Form Definition
+
+	Tabledefinition
+
+	Datatypes:
+	- INTEGER (Forces the input to Int)
+	- DOUBLE
+	- CURRENCY (Formats the values to currency notation)
+	- VARCHAR (no format check, maxlength: 255)
+	- TEXT (no format check)
+	- DATE (Dateformat, automatic conversion to timestamps)
+
+	Formtype:
+	- TEXT (Textfield)
+	- TEXTAREA (Textarea)
+	- PASSWORD (Password textfield, input is not shown when edited)
+	- SELECT (Select option field)
+	- RADIO
+	- CHECKBOX
+	- CHECKBOXARRAY
+	- FILE
+
+	VALUE:
+	- Wert oder Array
+
+	Hint:
+	The ID field of the database table is not part of the datafield definition.
+	The ID field must be always auto incement (int or bigint).
+
+	Search:
+	- searchable = 1 or searchable = 2 include the field in the search
+	- searchable = 1: this field will be the title of the search result
+	- searchable = 2: this field will be included in the description of the search result
+
+
+*/
+
+$form["title"]    = "Wizard template";
+$form["description"]  = "";
+$form["name"]    = "template";
+$form["action"]   = "template_edit.php";
+$form["db_table"]  = "wizard_template";
+$form["db_table_idx"] = "template_id";
+$form["db_history"]  = "yes";
+$form["tab_default"] = "site";
+$form["list_default"] = "template_list.php";
+$form["auth"]   = 'yes'; // yes / no
+
+$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
+$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
+$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
+$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
+
+$form["tabs"]['site'] = array(
+	'title'  => "Web",
+	'width'  => 100,
+	'template'  => "templates/template_site.htm",
+	'fields' => load_foreing_form('site', '../sites/form/web_vhost_domain.tform.php'),
+);
+
+$form["tabs"]['database'] = array(
+	'title'  => "Database",
+	'width'  => 100,
+	'template'  => "templates/template_database.htm",
+	'fields' => load_foreing_form('database', '../sites/form/database.tform.php'),
+);
+
+$form["tabs"]['ftp'] = array(
+	'title'  => "FTP",
+	'width'  => 100,
+	'template'  => "templates/template_ftp.htm",
+	'fields' => load_foreing_form('ftp', '../sites/form/ftp_user.tform.php'),
+);
+
+$form["tabs"]['ssh'] = array(
+	'title'  => "SSH",
+	'width'  => 100,
+	'template'  => "templates/template_ssh.htm",
+	'fields' => load_foreing_form('ssh', '../sites/form/shell_user.tform.php'),
+);
+
+$form["tabs"]['mail'] = array(
+	'title'  => "Mail",
+	'width'  => 100,
+	'template'  => "templates/template_mail.htm",
+	'fields' => load_foreing_form('mail', '../mail/form/mail_domain.tform.php'),
+);
+
+$form["tabs"]['dns'] = array(
+	'title'  => "DNS",
+	'width'  => 100,
+	'template'  => "templates/template_dns.htm",
+	'fields' => array(
+		'dns_server_id' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '',
+			'datasource' => array (  'type' => 'SQL',
+				'querystring' => 'SELECT server_id, server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} AND dns_server = 1 ORDER BY server_name',
+				'keyfield'=> 'server_id',
+				'valuefield'=> 'server_name',
+			),
+			'value'  => '',
+		),
+	),
+);
+
+function load_foreing_form($type, $path)
+{
+	global $app;
+	
+	require $path;
+	
+	switch($type)
+	{
+		case 'site':
+			$new_form = $form['tabs']['domain']['fields'] + $form['tabs']['redirect']['fields'] + $form['tabs']['advanced']['fields'];
+	
+			// unset fields
+			unset($new_form['domain']);
+			unset($new_form['type']);
+			unset($new_form['vhost_type']);
+			unset($new_form['ssl']);
+			unset($new_form['ssl_letsencrypt']);
+			unset($new_form['web_folder']);
+			unset($new_form['parent_domain_id']);
+			unset($new_form['active']);
+			unset($new_form['redirect_type']);
+			unset($new_form['redirect_path']);
+			unset($new_form['rewrite_rules']);
+			unset($new_form['document_root']);
+			unset($new_form['system_user']);
+			unset($new_form['system_group']);
+			unset($new_form['php_open_basedir']);
+			unset($new_form['proxy_directives']);
+			unset($new_form['added_date']);
+			unset($new_form['added_by']);
+			unset($new_form['enable_pagespeed']);
+			
+			// rename server id
+			$new_form['web_server_id'] = $new_form['server_id'];
+			unset($new_form['server_id']);
+			
+			// add template name field
+			$new_form['template_name'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
+						'errmsg'=> 'template_name_error_empty'),
+				),
+				'default' => '',
+				'value'  => '',
+				'width'  => '40',
+				'maxlength' => '255',
+			);
+			break;
+		case 'database':
+			$new_form = $form['tabs']['database']['fields'];
+		
+			// unset fields
+			unset($new_form['parent_domain_id']);
+			unset($new_form['type']);
+			unset($new_form['database_name']);
+			unset($new_form['database_name_prefix']);
+			unset($new_form['database_user_id']);
+			unset($new_form['database_ro_user_id']);
+			unset($new_form['active']);
+			
+			// rename fields
+			$new_form['database_server_id'] = $new_form['server_id'];
+			unset($new_form['server_id']);
+			$new_form['database_remote_access'] = $new_form['remote_access'];
+			unset($new_form['remote_access']);
+			$new_form['database_remote_ips'] = $new_form['remote_ips'];
+			unset($new_form['remote_ips']);
+			
+			break;
+		case 'ftp':
+			$new_form = $form['tabs']['advanced']['fields'];
+			
+			// unset fields
+			unset($new_form['uid']);
+			unset($new_form['gid']);
+			unset($new_form['dir']);
+			unset($new_form['expires']);
+		
+			break;
+		case 'ssh':
+			$new_form = $form['tabs']['advanced']['fields'];
+			
+			// unset fields
+			unset($new_form['puser']);
+			unset($new_form['pgroup']);
+			unset($new_form['dir']);
+		
+			// add chroot
+			$new_form['shell_chroot'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'SELECT',
+				'default' => '',
+				'value'  => array('no' => 'None', 'jailkit' => 'Jailkit')
+			);
+		
+			break;
+		case 'mail':
+			$new_form = $form['tabs']['domain']['fields'];
+		
+			// unset fields
+			unset($new_form['domain']);
+			unset($new_form['active']);
+			unset($new_form['dkim_private']);
+			unset($new_form['dkim_public']);
+		
+			// rename server id
+			$new_form['mail_server_id'] = $new_form['server_id'];
+			unset($new_form['server_id']);
+			
+			// add policy id
+			$new_form['policy'] = array(
+				'datatype' => 'INTEGER',
+				'formtype' => 'SELECT',
+				'default' => '',
+				'datasource' => array (  'type' => 'SQL',
+					'querystring' => 'SELECT id, policy_name FROM spamfilter_policy WHERE {AUTHSQL} ORDER BY policy_name',
+					'keyfield'=> 'id',
+					'valuefield'=> 'policy_name'
+				),
+				'value'  => '',	
+			);
+			
+			// add mailbox options
+			$new_form['mailbox_quota'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'validators' => array (  1 => array ( 'type' => 'ISINT',
+						'errmsg'=> 'quota_error_isint'),
+					0 => array ( 'type' => 'REGEX',
+						'regex' => '/^([0-9]{1,})$/',
+						'errmsg'=> 'quota_error_value'),
+				),
+				'default' => '-1',
+				'value'  => '',
+				'width'  => '30',
+				'maxlength' => '255'
+			);
+			$new_form['enablesmtp'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'CHECKBOX',
+				'default' => 'y',
+				'value'  => array(1 => 'y', 0 => 'n')
+			);
+			$new_form['enableimap'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'CHECKBOX',
+				'default' => 'y',
+				'value'  => array(1 => 'y', 0 => 'n')
+			);
+			$new_form['enablepop3'] = array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'CHECKBOX',
+				'default' => 'y',
+				'value'  => array(1 => 'y', 0 => 'n')
+			);
+			break;
+	}
+	
+	return $new_form;
+}
\ No newline at end of file
--- a/lib/admin.conf.php
+++ b/lib/admin.conf.php
+<?php
+
+/*
+    The admin.conf.php file contains menu definitions to be displayed in the administration module.
+    In this example there are none.
+*/
\ No newline at end of file
--- a/lib/lang/en_new_service.lng
+++ b/lib/lang/en_new_service.lng
+<?php
+$wb["client_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["db_txt"] = 'Create DB';
+$wb["db_type_txt"] = 'DB type';
+$wb["ftp_txt"] = 'Create FTP';
+$wb["ssh_txt"] = 'Create SSH';
+$wb["domain_error_empty"] = 'The domain-name is empty';
+$wb["domain_error_regex"] = 'This domain-name is not allowed';
+$wb['domain_error_unique'] = 'The domain already exists';
+$wb["template_id_txt"] = 'Template';
+$wb["mail_txt"] = 'Create Mail';
+$wb["mailboxes_txt"] = 'Mailboxes';
+$wb["mailboxes_help_txt"] = 'Separated by comma, just mailbox name without @domain.tld';
+$wb["dns_txt"] = 'Create DNS Zone';
+$wb['email_txt'] = 'Email';
+$wb['dnssec_txt'] = 'Sign zone (DNSSEC)';
+$wb['ns1_txt'] = 'NS 1';
+$wb['ns2_txt'] = 'NS 2';
+$wb['ip_txt'] = 'IP Address';
+$wb['ipv6_txt'] = 'IPv6 Address';
+$wb['error_origin_empty'] = 'Origin empty.';
+$wb['error_ns_empty'] = 'NS empty.';
+$wb['error_mbox_empty'] = 'Mbox empty.';
+$wb['error_refresh_empty'] = 'Refresh empty.';
+$wb['error_retry_empty'] = 'Retry empty.';
+$wb['error_expire_empty'] = 'Expire empty.';
+$wb['error_minimum_empty'] = 'Minimum empty.';
+$wb['error_ttl_empty'] = 'TTL empty.';
+$wb['error_domain_empty'] = 'Domain empty';
+$wb['error_ip_empty'] = 'IP empty.';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_ns1_empty'] = 'NS1 empty.';
+$wb['error_ns2_empty'] = 'NS2 empty.';
+$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
--- a/lib/lang/en_template.lng
+++ b/lib/lang/en_template.lng
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["ip_address_txt"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["perl_txt"] = 'Perl';
+$wb["ruby_txt"] = 'Ruby';
+$wb["python_txt"] = 'Python';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';