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

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

Browse Source
This commit is contained in:
Michael Kaufmann
2018-08-15 10:59:36 +02:00
parent 963c7c4616 b777053133
commit 174739bc0c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/formfields/admin/customer/formfield.customer_add.php
View File

@@ -178,7 +178,7 @@ return array(
'label' => $lng['customer']['diskspace'], 'label' => $lng['customer']['diskspace'],
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 6, 'maxlength' => 16,
'mandatory' => true, 'mandatory' => true,
'ul_field' => $diskspace_ul 'ul_field' => $diskspace_ul
), ),
@@ -186,7 +186,7 @@ return array(
'label' => $lng['customer']['traffic'], 'label' => $lng['customer']['traffic'],
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 4, 'maxlength' => 14,
'mandatory' => true, 'mandatory' => true,
'ul_field' => $traffic_ul 'ul_field' => $traffic_ul
), ),

4
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -170,7 +170,7 @@ return array(
'label' => $lng['customer']['diskspace'], 'label' => $lng['customer']['diskspace'],
'type' => 'textul', 'type' => 'textul',
'value' => $result['diskspace'], 'value' => $result['diskspace'],
'maxlength' => 6, 'maxlength' => 16,
'mandatory' => true, 'mandatory' => true,
'ul_field' => $diskspace_ul 'ul_field' => $diskspace_ul
), ),
@@ -178,7 +178,7 @@ return array(
'label' => $lng['customer']['traffic'], 'label' => $lng['customer']['traffic'],
'type' => 'textul', 'type' => 'textul',
'value' => $result['traffic'], 'value' => $result['traffic'],
'maxlength' => 4, 'maxlength' => 14,
'mandatory' => true, 'mandatory' => true,
'ul_field' => $traffic_ul 'ul_field' => $traffic_ul
), ),

4
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -238,7 +238,7 @@ class nginx extends HttpConfigBase
} else { } else {
$_sslport = $this->checkAlternativeSslPort(); $_sslport = $this->checkAlternativeSslPort();
$mypath = 'https://' . Settings::Get('system.hostname') . $_sslport . '/'; $mypath = 'https://' . Settings::Get('system.hostname') . $_sslport . '/';
$this->nginx_data[$vhost_filename] .= "\t" . 'if ($request_uri !~ ^/.well-known/acme-challenge/\w+$) {' . "\n"; $this->nginx_data[$vhost_filename] .= "\t" . 'if ($request_uri !~ ^/.well-known/acme-challenge/[-\w]+$) {' . "\n";
$this->nginx_data[$vhost_filename] .= "\t\t" . 'return 301 ' . $mypath . '$request_uri;' . "\n"; $this->nginx_data[$vhost_filename] .= "\t\t" . 'return 301 ' . $mypath . '$request_uri;' . "\n";
$this->nginx_data[$vhost_filename] .= "\t" . '}' . "\n"; $this->nginx_data[$vhost_filename] .= "\t" . '}' . "\n";
} }
@@ -487,7 +487,7 @@ class nginx extends HttpConfigBase
// Get domain's redirect code // Get domain's redirect code
$code = getDomainRedirectCode($domain['id']); $code = getDomainRedirectCode($domain['id']);
$vhost_content .= "\t" . 'if ($request_uri !~ ^/.well-known/acme-challenge/\w+$) {' . "\n"; $vhost_content .= "\t" . 'if ($request_uri !~ ^/.well-known/acme-challenge/[-\w]+$) {' . "\n";
$vhost_content .= "\t\t" . 'return ' . $code .' ' . $uri . '$request_uri;' . "\n"; $vhost_content .= "\t\t" . 'return ' . $code .' ' . $uri . '$request_uri;' . "\n";
$vhost_content .= "\t" . '}' . "\n"; $vhost_content .= "\t" . '}' . "\n";
} else { } else {