diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 67f0f3bdcbcb82ca3fea33a4540f77ba82fb23c7..ccbda9614b9649235432bf7d7328cf3c134a0c14 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -196,6 +196,7 @@ CREATE TABLE `client` (
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
+ `default_directive_snippet` INT(3) NULL DEFAULT NULL,
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
`web_servers` text,
`limit_web_ip` text,
@@ -326,6 +327,7 @@ CREATE TABLE `client_template` (
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
+ `default_directive_snippet` INT(3) NULL DEFAULT NULL,
`web_servers` text,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
diff --git a/install/sql/pre_update.sql b/install/sql/pre_update.sql
index cf515106a3985633ea229f0b8147e04c06684a9a..539935a408c8afd0d8e152b3de21bcf9f73e4ace 100644
--- a/install/sql/pre_update.sql
+++ b/install/sql/pre_update.sql
@@ -26,7 +26,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
---
+--
-- These SQL commands will be executed before the ISPConfig update is performed.
--
@@ -43,4 +43,8 @@ DROP TABLE IF EXISTS `domain_handle`;
DROP TABLE IF EXISTS `domain_provider`;
DROP TABLE IF EXISTS `domain_tld`;
-SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- Default Directive Snippets --
+ALTER TABLE `client` ADD `default_directive_snippet` INT(3) NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
+ALTER TABLE `client_template` ADD `default_directive_snippet` INT(3) NULL DEFAULT NULL AFTER `web_servers`;
\ No newline at end of file
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index 4a3405bbe5f622a8fce3328a3d16156626269021..63552ce0e6f2944e8d02ffd27fc5c9f99a417559 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -672,6 +672,17 @@ $form["tabs"]['limits'] = array (
'default' => 'n',
'valuelimit' => 'client:limit_directive_snippets',
'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'default_directive_snippet' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE active='y' AND type='apache' AND required_php_snippets != '' AND {AUTHSQL} ORDER BY directive_snippets_id",
+ 'keyfield'=> 'directive_snippets_id',
+ 'valuefield'=> 'name'
+ ),
),/*
'default_dnsserver' => array (
'datatype' => 'INTEGER',
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index 0a88594a596ba0abf017cf2327cf11bfb97ee02d..0e94bad1b31a1716e6d717e725ebe3f775bdab44 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index 75f89a0feaf103179cb050f2c887dad23836d45a..635b838a28b903b727ad7f2ca26a1e183cddede0 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index ee96172de890f04224ba6ba469ed6924030508ee..18958647c68cc2d5e5db0b4f31195cc6ed0cb94a 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -125,4 +125,6 @@ $wb['xmpp_servers_txt'] = 'Servidores xmpp';
$wb['db_servers_txt'] = 'Servidores de banco de dados';
$wb['mail_servers_txt'] = 'Servidores de e-mail';
$wb['Limits'] = 'Limites';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng
index aa51796744065e73767b39037d08c8f93970fe81..842a2a5d0e6f8ef68cb461a7210a7bd772b611b6 100644
--- a/interface/web/client/lib/lang/ca_client_template.lng
+++ b/interface/web/client/lib/lang/ca_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 6b711f44de78e0188e6ddd0c74ed81384828da13..5fe870426e748397f7dc5d7f80e10f5655d581d5 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -116,10 +116,12 @@ $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
$wb['limit_xmpp_status_txt'] = 'Status host available';
$wb['dns_servers_txt'] = 'DNS servery';
$wb['limit_ssl_letsencrypt_txt'] = 'Lets Encrypt SSL - dostupná volba pro klienta';
-$wb['limit_directive_snippets_txt'] = 'Výběr configurace webového serveru - dostupná volba pro klienta';
+$wb['limit_directive_snippets_txt'] = 'Výběr konfigurace webového serveru - dostupná volba pro klienta';
$wb['limit_database_user_txt'] = 'Max. počet databázových uživatelů';
$wb['web_servers_txt'] = 'Webové servery';
$wb['db_servers_txt'] = 'Databázové servery';
$wb['mail_servers_txt'] = 'E-mailové servery';
$wb['Limits'] = 'Limity';
+$wb['default_directive_snippet_txt'] = 'Výchozí konfigurace webového serveru';
+$wb['default_directive_snippet_none_txt'] = 'Žádná';
?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index a8431a81878988f8fde1ad02758676606fc06fbf..3d81b960b227523965dc66cd2cd8930f90bab62e 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Web-Server';
$wb['db_servers_txt'] = 'Datenbank-Server';
$wb['mail_servers_txt'] = 'Mail-Server';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng
index 04acf57d64ac8e999f7178e948dcc3d1557c8ba1..8f5dea4850c9066e3f8bd99655afc1fa6904031f 100644
--- a/interface/web/client/lib/lang/dk_client_template.lng
+++ b/interface/web/client/lib/lang/dk_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 91be0bcffd0ea72433646a1586091663f6119e16..ea79f918d3e2d968e31a5f4923097ada671b1a7d 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index aa3dfdcb6e592b4b5013b1d26a05b6ce9e7ea60c..1abf1e99ac9fced79cf88fcc4e156d35a10b5277 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -125,4 +125,6 @@ $wb['xmpp_servers_txt'] = 'XMPP Servers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index 5c55b23f89e31b3e1c22d4f6b8b4e51624cb35a9..0f5dc178d120ad6a5bf9a0f55a2ea849911093a3 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index 70d9069664adfa3c5b20b0a37234c82e4ff418c3..8e47053556b926af476af27f35f2d4ec8d9efd95 100644
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index b81788c0d441ba274b6823c581a80c553d39ad11..e2656558e5a00fc16f6526e9b7509a3ef7b2bd3a 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index 12fabbe72308f34821d23d9ff1412d81ed93f6ee..dd4a46d707016dba14fdbcb5737245b3f82bd86a 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index 3df432a6612cdc53ea3cd5dfce17e2574bc6fd68..4544068952c46b8bd4e0c5eba7c3615e3d1d2925 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 57c55be57648a7db16ef9827d22a386b1de2a7d0..3527183ee73e1751a79bc547680c81ede469048f 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index 40ef74de160797b3534a5da9a2c5004fb32dfe57..fa346ab93e9f5fb5bec4a403de804c44284afc9c 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index 7381465d66bd68c4a957412ea0531e964974828e..65988f798b2ed720553e8fd3dd2928490f45ee1a 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index da4721757d4ef63f605c40248f59b101a95c8913..f607af760867801ab024a9cf39d0fe12a4383edd 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index 3a878ec9746b4bb9908777c2e80cfe4addbef39c..b0a60f9af849ac0c232913340b86dc342eb74a5c 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index 0c4a949d49d89b75173c953794734b04f83b4856..8bc9037619839b1251b1a24756442a73be07c773 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index 57cbe690ddc4eef4ed84c27931ab846becdda8ef..834dcddcd71d65cbf04250de459a7217c1afde69 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index 46168e1ad55e2e21265e87c6ab4a822cd92b350a..ffe6961a146ad7dc4007197158116b0c218d9f01 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Web-серверы';
$wb['db_servers_txt'] = 'Серверы баз данных';
$wb['mail_servers_txt'] = 'Серверы почты';
$wb['Limits'] = 'Лимиты';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index 46932c9e50960fd7273b4a06e12934c0864969fa..e62bad22637bb22ad4f39b3889aff0ddabff9807 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index e3cb788bdd6ce5c412ca6349576ccd5f229ebe9c..be4106d6915f69b14244bc6a478e83a77c04ce34 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -122,4 +122,6 @@ $wb['web_servers_txt'] = 'Webservers';
$wb['db_servers_txt'] = 'Database servers';
$wb['mail_servers_txt'] = 'Mailservers';
$wb['Limits'] = 'Limits';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 8ae0954db550fb2ecce8cc12386808f92fc0e504..b004a3b48ff884d6b494263131a3341375651993 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -125,4 +125,6 @@ $wb['xmpp_servers_txt'] = 'XMPP Sunucuları';
$wb['db_servers_txt'] = 'Veritabanı Sunucuları';
$wb['mail_servers_txt'] = 'E-posta Sunucuları';
$wb['Limits'] = 'Sınırlar';
+$wb['default_directive_snippet_txt'] = 'Default Directive snippet';
+$wb['default_directive_snippet_none_txt'] = 'None';
?>
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 005db0724a9d7c70a4986d5f00d7ea2e11073b08..e215c97be00e36dbf2797acd4bdf68c6a72688d9 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -124,7 +124,14 @@
{tmpl_var name='limit_directive_snippets'}
-
+
+
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 9b1117fb2b5ee67f1a39d150d8c998ed525fffc3..3d07b69a4fbd89c34351e988c5806eaa701996c9 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -1085,6 +1085,15 @@ class page_action extends tform_actions {
// Clients may not set the client_group_id, so we unset them if user is not a admin and the client is not a reseller
if(!$app->auth->has_clients($_SESSION['s']['user']['userid'])) unset($this->dataRecord["client_group_id"]);
+
+ # Get default directive snippets defined in client template
+ $default_directive_snippet = $app->db->queryOneRecord("SELECT client.default_directive_snippet FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+ if($default_directive_snippet['default_directive_snippet'] != '0') {
+ # Set Default directive snippet only if there is no custom per website already configured
+ if($this->dataRecord['directive_snippets_id'] == '0') {
+ $this->dataRecord['directive_snippets_id'] = intval($default_directive_snippet['default_directive_snippet']);
+ }
+ }
}
//* make sure that the domain is lowercase