maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

other stuff

Browse Source
This commit is contained in:
Udo Waechter
2018-03-23 12:31:46 +01:00
parent 2c7502485b
commit 2ab6b9f6f3
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dns_editor.php
View File

@@ -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));

4
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -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");

2
templates/Maketank/admin/domains/domains_domain.tpl
View File

@@ -26,7 +26,7 @@
</a>
</if>
<if $row['letsencrypt'] == '1'>
&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
&nbsp;<img width="16px" src="templates/{$theme}/assets/img/icons/ssl.svg" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != Settings::Get('system.hostname_id')>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>

1
templates/Maketank/assets/img/icons/ssl.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

2
templates/Maketank/customer/domains/domains_domain.tpl
View File

@@ -36,7 +36,7 @@
</a>&nbsp;
</if>
<if $row['letsencrypt'] == '1'>
<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
<img width="16px" src="templates/{$theme}/assets/img/icons/ssl.svg" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if>
<if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
({$lng['domains']['isassigneddomain']})&nbsp;