Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 46e4fe852b91 · 2019-02-26T14:39:11.000+01:00
Stable 3.1

See merge request ispconfig/ispconfig3!877
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -78,3 +78,4 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WISeKey', 'wisekey.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WoSign', 'wosign.com', 'Y', '', 0);
 
+ALTER TABLE `dns_soa` CHANGE `xfer` `xfer` TEXT NOT NULL DEFAULT '';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -620,7 +620,7 @@ CREATE TABLE `dns_soa` (
   `minimum` int(11) unsigned NOT NULL default '3600',
   `ttl` int(11) unsigned NOT NULL default '3600',
   `active` enum('N','Y') NOT NULL DEFAULT 'N',
-  `xfer` varchar(255) NOT NULL DEFAULT '',
+  `xfer` TEXT NOT NULL DEFAULT '',
   `also_notify` varchar(255) default NULL,
   `update_acl` varchar(255) default NULL,
   `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
diff --git a/interface/web/dns/lib/lang/ar_dns_template.lng b/interface/web/dns/lib/lang/ar_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Name';
 $wb['fields_txt'] = 'Fields';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_template.lng b/interface/web/dns/lib/lang/bg_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Име';
 $wb['fields_txt'] = 'Полета';
 $wb['template_txt'] = 'Шаблон';
 $wb['visible_txt'] = 'Видим';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_template.lng b/interface/web/dns/lib/lang/br_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nome';
 $wb['fields_txt'] = 'Campos';
 $wb['template_txt'] = 'Gabarito';
 $wb['visible_txt'] = 'Visível';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/ca_dns_template.lng b/interface/web/dns/lib/lang/ca_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nom';
 $wb['fields_txt'] = 'Champs';
 $wb['template_txt'] = 'Modèle';
 $wb['visible_txt'] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Název';
 $wb['fields_txt'] = 'Pole';
 $wb['template_txt'] = 'Šablona';
 $wb['visible_txt'] = 'Viditelný';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_template.lng b/interface/web/dns/lib/lang/de_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Name';
 $wb['fields_txt'] = 'Felder';
 $wb['template_txt'] = 'Vorlage';
 $wb['visible_txt'] = 'Sichtbar';
+$wb['placeholder_txt'] = 'Platzhalter';
 ?>
diff --git a/interface/web/dns/lib/lang/dk_dns_template.lng b/interface/web/dns/lib/lang/dk_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Navn';
 $wb['fields_txt'] = 'Felter';
 $wb['template_txt'] = 'Skabelon';
 $wb['visible_txt'] = 'Synlig';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Όνομα';
 $wb['fields_txt'] = 'Πεδία';
 $wb['template_txt'] = 'Πρότυπο';
 $wb['visible_txt'] = 'Ενεργό';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/en_dns_template.lng b/interface/web/dns/lib/lang/en_dns_template.lng
@@ -3,4 +3,5 @@ $wb["name_txt"] = 'Name';
 $wb["fields_txt"] = 'Fields';
 $wb["template_txt"] = 'Template';
 $wb["visible_txt"] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_template.lng b/interface/web/dns/lib/lang/es_dns_template.lng
@@ -3,4 +3,5 @@ $wb['fields_txt'] = 'Campos';
 $wb['name_txt'] = 'Nombre';
 $wb['template_txt'] = 'Plantilla';
 $wb['visible_txt'] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_template.lng b/interface/web/dns/lib/lang/fi_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nimi';
 $wb['fields_txt'] = 'Kentät';
 $wb['template_txt'] = 'Malli';
 $wb['visible_txt'] = 'Näkyvissä';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_template.lng b/interface/web/dns/lib/lang/fr_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nom';
 $wb['fields_txt'] = 'Champs';
 $wb['template_txt'] = 'Modèle';
 $wb['visible_txt'] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/hr_dns_template.lng b/interface/web/dns/lib/lang/hr_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Naziv';
 $wb['fields_txt'] = 'Polja';
 $wb['template_txt'] = 'Predložak';
 $wb['visible_txt'] = 'Vidljivo';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_template.lng b/interface/web/dns/lib/lang/hu_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Név';
 $wb['fields_txt'] = 'Mezők';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Látható';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_template.lng b/interface/web/dns/lib/lang/id_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nama';
 $wb['fields_txt'] = 'Kolom';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Terlihat';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_template.lng b/interface/web/dns/lib/lang/it_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nome';
 $wb['fields_txt'] = 'Fields';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Visible';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_template.lng b/interface/web/dns/lib/lang/ja_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = '名前';
 $wb['fields_txt'] = 'フィールド';
 $wb['template_txt'] = 'テンプレート';
 $wb['visible_txt'] = '公開する';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_template.lng b/interface/web/dns/lib/lang/nl_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Naam';
 $wb['fields_txt'] = 'Velden';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Zichtbaar';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nazwa';
 $wb['fields_txt'] = 'Pola';
 $wb['template_txt'] = 'Szablon';
 $wb['visible_txt'] = 'Widoczność';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_template.lng b/interface/web/dns/lib/lang/pt_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nome';
 $wb['fields_txt'] = 'Campos';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Visível';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_template.lng b/interface/web/dns/lib/lang/ro_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Nume';
 $wb['fields_txt'] = 'Campuri';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Vizibil';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_template.lng b/interface/web/dns/lib/lang/ru_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Имя';
 $wb['fields_txt'] = 'Поля';
 $wb['template_txt'] = 'Шаблон';
 $wb['visible_txt'] = 'Видимый';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_template.lng b/interface/web/dns/lib/lang/se_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Namn';
 $wb['fields_txt'] = 'Fält';
 $wb['template_txt'] = 'Mall';
 $wb['visible_txt'] = 'Synlig';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_template.lng b/interface/web/dns/lib/lang/sk_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Meno';
 $wb['fields_txt'] = 'Polia';
 $wb['template_txt'] = 'Šablóna';
 $wb['visible_txt'] = 'Viditeľné';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_template.lng b/interface/web/dns/lib/lang/tr_dns_template.lng
@@ -3,4 +3,5 @@ $wb['name_txt'] = 'Ad';
 $wb['fields_txt'] = 'Alanlar';
 $wb['template_txt'] = 'Kalıp';
 $wb['visible_txt'] = 'Görünür';
+$wb['placeholder_txt'] = 'Placeholder';
 ?>
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm
@@ -16,7 +16,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
             </div>
             <div class="form-group">
                 <label for="template" class="col-sm-3 control-label">{tmpl_var name='template_txt'}</label>
-                <div class="col-sm-9"><textarea class="form-control" name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea></div>
+                <div class="col-sm-9"><textarea class="form-control" name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea>
+                &nbsp; DNS {tmpl_var name='placeholder_txt'}: <a href="javascript:void(0);" class="addPlaceholder">{DOMAIN}</a>, <a href="javascript:void(0);" class="addPlaceholder">{IP}</a>, <a href="javascript:void(0);" class="addPlaceholder">{IPV6}</a>, <a href="javascript:void(0);" class="addPlaceholder">{NS1}</a>, <a href="javascript:void(0);" class="addPlaceholder">{NS2}</a>, <a href="javascript:void(0);" class="addPlaceholder">{EMAIL}</a>
+
+</div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='visible_txt'}</label>
@@ -31,4 +34,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_template_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_template_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
+        </div></div>

Original file line number	Diff line number	Diff line change
@@ -78,3 +78,4 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
`78`	`78`	`(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WISeKey', 'wisekey.com', 'Y', '', 0),`
`79`	`79`	`(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WoSign', 'wosign.com', 'Y', '', 0);`
`80`	`80`
	`81`	+ALTER TABLE `dns_soa` CHANGE `xfer` `xfer` TEXT NOT NULL DEFAULT '';