Merge remote-tracking branch 'origin/master' into 0.10.0

This commit is contained in:
Michael Kaufmann
2018-04-25 12:30:00 +02:00
8 changed files with 4701 additions and 11 deletions

View File

@@ -43,9 +43,9 @@ class DnsEntry
{
$_content = $this->content;
// check content length for txt records for bind9 (multiline)
if (Settings::Get('system.dns_server') != 'pdns' && $this->type == 'TXT' && strlen($_content) >= 64) {
if (Settings::Get('system.dns_server') != 'pdns' && $this->type == 'TXT' && strlen($_content) >= 255) {
// split string
$_contentlines = str_split($_content, 63);
$_contentlines = str_split($_content, 254);
// first line
$_l = array_shift($_contentlines);
// check for starting quote