diff --git a/dns_editor.php b/dns_editor.php index 15687b10..12daca2c 100644 --- a/dns_editor.php +++ b/dns_editor.php @@ -57,7 +57,7 @@ if ($action == 'add_record' && ! empty($_POST)) { $errors[] = $lng['error']['domain_nopunycode']; } else { $record = $idna_convert->encode($record); - if ($type != 'SRV' && $type != 'TXT') { + if ($type != 'SRV' && $type != 'TXT' && $type != "CNAME" ) { $check_dom = $record . '.example.com'; if (! validateDomain($check_dom)) { $errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record)); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index e01f7e35..c928f465 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3416,7 +3416,6 @@ if (isFroxlorVersion('0.9.37-rc1')) { updateToVersion('0.9.37'); } -<<<<<<< HEAD if (isDatabaseVersion('201607210')) { showUpdateStep("Adding new settings for customer shell option"); @@ -3503,7 +3502,7 @@ if (isDatabaseVersion('201609240')) { updateToDbVersion('201610070'); } -if (isFroxlorVersion('0.9.37')) { +if (isFroxlorVersion('0.9.37-greylist2')) { showUpdateStep("Updating from 0.9.37 to 0.9.38-rc1", false); updateToVersion('0.9.38-rc1'); @@ -3552,6 +3551,7 @@ if (isFroxlorVersion('0.9.38.3')) { showUpdateStep("Updating from 0.9.38.3 to 0.9.38.4", false); updateToVersion('0.9.38.4'); +} if(isFroxlorVersion('0.9.37')) { showUpdateStep("Adding Database column for greylisting",false); Database::query("ALTER TABLE `".TABLE_MAIL_VIRTUAL."` ADD COLUMN IF NOT EXISTS disablegreylist TINYINT(1) DEFAULT 0"); diff --git a/templates/Maketank/admin/domains/domains_domain.tpl b/templates/Maketank/admin/domains/domains_domain.tpl index 4ccf717c..e9d222e4 100644 --- a/templates/Maketank/admin/domains/domains_domain.tpl +++ b/templates/Maketank/admin/domains/domains_domain.tpl @@ -26,7 +26,7 @@ -  {$lng['panel']['letsencrypt']} +  {$lng['panel']['letsencrypt']} diff --git a/templates/Maketank/assets/img/icons/ssl.svg b/templates/Maketank/assets/img/icons/ssl.svg new file mode 100644 index 00000000..edd7aeed --- /dev/null +++ b/templates/Maketank/assets/img/icons/ssl.svg @@ -0,0 +1 @@ +Plasm \ No newline at end of file diff --git a/templates/Maketank/customer/domains/domains_domain.tpl b/templates/Maketank/customer/domains/domains_domain.tpl index 89ae2c60..7cb703d4 100644 --- a/templates/Maketank/customer/domains/domains_domain.tpl +++ b/templates/Maketank/customer/domains/domains_domain.tpl @@ -36,7 +36,7 @@   - {$lng['panel']['letsencrypt']} + {$lng['panel']['letsencrypt']} ({$lng['domains']['isassigneddomain']})