Skip to content

Commit e177adf

Browse files
florian030florian030
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents 6e9deb7 + ecd0e38 commit e177adf

36 files changed

+108
-12
lines changed

‎interface/lib/classes/remote.d/dns.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public function dns_zone_get_id($session_id, $origin) {
249249
return false;
250250
}
251251

252-
if(!preg_match('/^[a-z0-9][a-z0-9\-]+[a-z0-9](\.[a-z]{2,4})+$/i', $origin)){
252+
if(!preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,63}$/', $origin)){
253253
throw new SoapFault('no_domain_found', 'Invalid domain name.');
254254
return false;
255255
}

‎interface/web/client/templates/client_edit_limits.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ <h4 class="panel-title">
125125
</div>
126126
<div class="form-group">
127127
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
128-
<div class="col-sm-9">
128+
<div class="col-sm-9" data-uncheck-fields="limit_ssl_letsencrypt">
129129
{tmpl_var name='limit_ssl'}
130130
</div>
131131
</div>
132132
<div class="form-group">
133133
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
134-
<div class="col-sm-9">
134+
<div class="col-sm-9" data-check-fields="limit_ssl">
135135
{tmpl_var name='limit_ssl_letsencrypt'}
136136
</div>
137137
</div>

‎interface/web/client/templates/client_template_edit_limits.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ <h4 class="panel-title">
8282
</div>
8383
<div class="form-group">
8484
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
85-
<div class="col-sm-9">
85+
<div class="col-sm-9" data-uncheck-fields="limit_ssl_letsencrypt">
8686
{tmpl_var name='limit_ssl'}
8787
</div>
8888
</div>
8989
<div class="form-group">
9090
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
91-
<div class="col-sm-9">
91+
<div class="col-sm-9" data-check-fields="limit_ssl">
9292
{tmpl_var name='limit_ssl_letsencrypt'}
9393
</div>
9494
</div>
@@ -318,7 +318,7 @@ <h4 class="panel-title">
318318
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
319319
<div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div>
320320
</div>
321-
321+
322322
</div>
323323
</div>
324324
</div>

‎interface/web/client/templates/reseller_edit_limits.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ <h4 class="panel-title">
127127
</div>
128128
<div class="form-group">
129129
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
130-
<div class="col-sm-9">
130+
<div class="col-sm-9" data-uncheck-fields="limit_ssl_letsencrypt">
131131
{tmpl_var name='limit_ssl'}
132132
</div>
133133
</div>
134134
<div class="form-group">
135135
<label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_letsencrypt_txt'}</label>
136-
<div class="col-sm-9">
136+
<div class="col-sm-9" data-check-fields="limit_ssl">
137137
{tmpl_var name='limit_ssl_letsencrypt'}
138138
</div>
139139
</div>
@@ -362,7 +362,7 @@ <h4 class="panel-title">
362362
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
363363
<div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div>
364364
</div>
365-
365+
366366
</div>
367367
</div>
368368
</div>

‎interface/web/sites/lib/lang/ar_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
196196
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197197
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198198
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
199+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

‎interface/web/sites/lib/lang/bg_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
196196
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197197
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198198
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
199+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

‎interface/web/sites/lib/lang/br_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
201201
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
202202
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
203203
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
204+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

‎interface/web/sites/lib/lang/ca_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
196196
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197197
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198198
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
199+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

‎interface/web/sites/lib/lang/cz_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
196196
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197197
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198198
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
199+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

‎interface/web/sites/lib/lang/de_web_vhost_domain.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,4 @@ $wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroo
196196
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197197
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198198
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
199+
$wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';

0 commit comments

Comments
 (0)