Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
15b96b9c
Commit
15b96b9c
authored
Feb 15, 2014
by
Till Brehm
Browse files
Fixed: FS#3131 - Wrong Apache setting for Subdomain (vhost) without hostname
parent
c0a1a4d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
View file @
15b96b9c
...
...
@@ -124,4 +124,5 @@ $wb['variables_txt'] = 'Variables';
$wb
[
'backup_excludes_txt'
]
=
'Excluded Directories'
;
$wb
[
'backup_excludes_note_txt'
]
=
'(Separate multiple directories with commas. Example: web/cache/*,web/backup)'
;
$wb
[
'backup_excludes_error_regex'
]
=
'The excluded directories contain invalid characters.'
;
$wb
[
'subdomain_error_empty'
]
=
'The subdommain field is empty or contains invalid characters.'
;
?>
\ No newline at end of file
interface/web/sites/web_vhost_subdomain_edit.php
View file @
15b96b9c
...
...
@@ -348,6 +348,11 @@ class page_action extends tform_actions {
if
(
$app
->
tform
->
getCurrentTab
()
==
'domain'
)
{
// Check that domain (the subdomain part) is not empty
if
(
!
preg_match
(
'/^[a-zA-Z0-9].+/'
,
$this
->
dataRecord
[
'domain'
]))
{
$app
->
tform
->
errorMessage
.
=
$app
->
tform
->
lng
(
"subdomain_error_empty"
)
.
"<br />"
;
}
/* check if the domain module is used - and check if the selected domain can be used! */
$app
->
uses
(
'ini_parser,getconf'
);
$settings
=
$app
->
getconf
->
get_global_config
(
'domains'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment