Skip to content

Commit d73e992

Browse files
tbrehmtbrehm
committed
Fixed subdomain form.
1 parent 9b68e89 commit d73e992

File tree

4 files changed

+96
-92
lines changed

4 files changed

+96
-92
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ CREATE TABLE `web_domain` (
968968
`suexec` enum('n','y') NOT NULL default 'y',
969969
`errordocs` tinyint(1) NOT NULL default '1',
970970
`is_subdomainwww` tinyint(1) NOT NULL default '1',
971-
`subdomain` enum('none','www','*') NOT NULL default 'www',
971+
`subdomain` enum('none','www','*') NOT NULL default 'none',
972972
`php` varchar(32) NOT NULL default 'y',
973973
`redirect_type` varchar(255) default NULL,
974974
`redirect_path` varchar(255) default NULL,

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

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
1-
<?php
2-
$wb["ssl_state_txt"] = 'State';
3-
$wb["ssl_locality_txt"] = 'Locality';
4-
$wb["ssl_organisation_txt"] = 'Organisation';
5-
$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
6-
$wb["ssl_country_txt"] = 'Country';
7-
$wb["ssl_request_txt"] = 'SSL Request';
8-
$wb["ssl_cert_txt"] = 'SSL Certificate';
9-
$wb["ssl_bundle_txt"] = 'SSL Bundle';
10-
$wb["ssl_action_txt"] = 'SSL Action';
11-
$wb["server_id_txt"] = 'Server';
12-
$wb["domain_txt"] = 'Domain';
13-
$wb["type_txt"] = 'Type';
14-
$wb["parent_domain_id_txt"] = 'Parent Website';
15-
$wb["redirect_type_txt"] = 'Redirect Type';
16-
$wb["redirect_path_txt"] = 'Redirect Path';
17-
$wb["active_txt"] = 'Active';
18-
$wb["document_root_txt"] = 'Documentroot';
19-
$wb["system_user_txt"] = 'Linux User';
20-
$wb["system_group_txt"] = 'Linux Group';
21-
$wb["ip_address_txt"] = 'IP-Address';
22-
$wb["vhost_type_txt"] = 'VHost Type';
23-
$wb["hd_quota_txt"] = 'Harddisk Quota';
24-
$wb["traffic_quota_txt"] = 'Traffic Quota';
25-
$wb["cgi_txt"] = 'CGI';
26-
$wb["ssi_txt"] = 'SSI';
27-
$wb["errordocs_txt"] = 'Own Error-Documents';
28-
$wb["subdomain_txt"] = 'Auto-Subdomain';
29-
$wb["ssl_txt"] = 'SSL';
30-
$wb["suexec_txt"] = 'SuEXEC';
31-
$wb["php_txt"] = 'PHP';
32-
$wb["client_txt"] = 'Client';
33-
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
34-
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
35-
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
36-
$wb["apache_directives_txt"] = 'Apache directives';
37-
$wb["domain_error_empty"] = 'Domain is empty.';
38-
$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
39-
$wb["domain_error_regex"] = 'Domain name invalid.';
40-
$wb["hd_quota_error_empty"] = 'Harddisk quota is empty.';
41-
$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
42-
$wb['error_ssl_state_empty'] = 'SSL State is empty.';
43-
$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
44-
$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
45-
$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
46-
$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
47-
$wb["client_group_id_txt"] = 'Client';
48-
$wb["stats_password_txt"] = 'Webstatistics password';
49-
50-
?>
1+
<?php
2+
$wb["ssl_state_txt"] = 'State';
3+
$wb["ssl_locality_txt"] = 'Locality';
4+
$wb["ssl_organisation_txt"] = 'Organisation';
5+
$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
6+
$wb["ssl_country_txt"] = 'Country';
7+
$wb["ssl_request_txt"] = 'SSL Request';
8+
$wb["ssl_cert_txt"] = 'SSL Certificate';
9+
$wb["ssl_bundle_txt"] = 'SSL Bundle';
10+
$wb["ssl_action_txt"] = 'SSL Action';
11+
$wb["server_id_txt"] = 'Server';
12+
$wb["domain_txt"] = 'Domain';
13+
$wb["type_txt"] = 'Type';
14+
$wb["parent_domain_id_txt"] = 'Parent Website';
15+
$wb["redirect_type_txt"] = 'Redirect Type';
16+
$wb["redirect_path_txt"] = 'Redirect Path';
17+
$wb["active_txt"] = 'Active';
18+
$wb["document_root_txt"] = 'Documentroot';
19+
$wb["system_user_txt"] = 'Linux User';
20+
$wb["system_group_txt"] = 'Linux Group';
21+
$wb["ip_address_txt"] = 'IP-Address';
22+
$wb["vhost_type_txt"] = 'VHost Type';
23+
$wb["hd_quota_txt"] = 'Harddisk Quota';
24+
$wb["traffic_quota_txt"] = 'Traffic Quota';
25+
$wb["cgi_txt"] = 'CGI';
26+
$wb["ssi_txt"] = 'SSI';
27+
$wb["errordocs_txt"] = 'Own Error-Documents';
28+
$wb["subdomain_txt"] = 'Auto-Subdomain';
29+
$wb["ssl_txt"] = 'SSL';
30+
$wb["suexec_txt"] = 'SuEXEC';
31+
$wb["php_txt"] = 'PHP';
32+
$wb["client_txt"] = 'Client';
33+
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
34+
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
35+
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
36+
$wb["apache_directives_txt"] = 'Apache directives';
37+
$wb["domain_error_empty"] = 'Domain is empty.';
38+
$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
39+
$wb["domain_error_regex"] = 'Domain name invalid.';
40+
$wb["hd_quota_error_empty"] = 'Harddisk quota is empty.';
41+
$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
42+
$wb['error_ssl_state_empty'] = 'SSL State is empty.';
43+
$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
44+
$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
45+
$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
46+
$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
47+
$wb["client_group_id_txt"] = 'Client';
48+
$wb["stats_password_txt"] = 'Webstatistics password';
49+
?>

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

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
<?php
2-
$wb["ssl_state_txt"] = 'State';
3-
$wb["ssl_locality_txt"] = 'Locality';
4-
$wb["ssl_organisation_txt"] = 'Organisation';
5-
$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
6-
$wb["ssl_country_txt"] = 'Country';
7-
$wb["ssl_request_txt"] = 'SSL Request';
8-
$wb["ssl_cert_txt"] = 'SSL Certificate';
9-
$wb["ssl_bundle_txt"] = 'SSL Bundle';
10-
$wb["ssl_action_txt"] = 'SSL Action';
11-
$wb["server_id_txt"] = 'Server';
12-
$wb["domain_txt"] = 'Domain';
13-
$wb["type_txt"] = 'Type';
14-
$wb["parent_domain_id_txt"] = 'Parent Website';
15-
$wb["redirect_type_txt"] = 'Redirect Type';
16-
$wb["redirect_path_txt"] = 'Redirect Path';
17-
$wb["active_txt"] = 'Active';
18-
$wb["document_root_txt"] = 'Documentroot';
19-
$wb["system_user_txt"] = 'Linux User';
20-
$wb["system_group_txt"] = 'Linux Group';
21-
$wb["ip_address_txt"] = 'IP-Address';
22-
$wb["vhost_type_txt"] = 'VHost Type';
23-
$wb["hd_quota_txt"] = 'Harddisk Quota';
24-
$wb["traffic_quota_txt"] = 'Traffic Quaota';
25-
$wb["cgi_txt"] = 'CGI';
26-
$wb["ssi_txt"] = 'SSI';
27-
$wb["ssl_txt"] = 'SSL';
28-
$wb["suexec_txt"] = 'SuEXEC';
29-
$wb["php_txt"] = 'PHP';
30-
$wb["client_txt"] = 'Client';
31-
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
32-
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
33-
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
34-
$wb["apache_directives_txt"] = 'Apache directives';
35-
$wb["domain_error_empty"] = 'Domain is empty.';
36-
$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
37-
$wb["domain_error_regex"] = 'Domain name invalid.';
1+
<?php
2+
$wb["ssl_state_txt"] = 'State';
3+
$wb["ssl_locality_txt"] = 'Locality';
4+
$wb["ssl_organisation_txt"] = 'Organisation';
5+
$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
6+
$wb["ssl_country_txt"] = 'Country';
7+
$wb["ssl_request_txt"] = 'SSL Request';
8+
$wb["ssl_cert_txt"] = 'SSL Certificate';
9+
$wb["ssl_bundle_txt"] = 'SSL Bundle';
10+
$wb["ssl_action_txt"] = 'SSL Action';
11+
$wb["server_id_txt"] = 'Server';
12+
$wb["domain_txt"] = 'Domain';
13+
$wb["type_txt"] = 'Type';
14+
$wb["parent_domain_id_txt"] = 'Parent Website';
15+
$wb["redirect_type_txt"] = 'Redirect Type';
16+
$wb["redirect_path_txt"] = 'Redirect Path';
17+
$wb["active_txt"] = 'Active';
18+
$wb["document_root_txt"] = 'Documentroot';
19+
$wb["system_user_txt"] = 'Linux User';
20+
$wb["system_group_txt"] = 'Linux Group';
21+
$wb["ip_address_txt"] = 'IP-Address';
22+
$wb["vhost_type_txt"] = 'VHost Type';
23+
$wb["hd_quota_txt"] = 'Harddisk Quota';
24+
$wb["traffic_quota_txt"] = 'Traffic Quaota';
25+
$wb["cgi_txt"] = 'CGI';
26+
$wb["ssi_txt"] = 'SSI';
27+
$wb["ssl_txt"] = 'SSL';
28+
$wb["suexec_txt"] = 'SuEXEC';
29+
$wb["php_txt"] = 'PHP';
30+
$wb["client_txt"] = 'Client';
31+
$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.';
32+
$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.';
33+
$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.';
34+
$wb["apache_directives_txt"] = 'Apache directives';
35+
$wb["domain_error_empty"] = 'Domain is empty.';
36+
$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.';
37+
$wb["domain_error_regex"] = 'Domain name invalid.';
38+
$wb["host_txt"] = 'Host';
3839
?>

‎interface/web/sites/templates/web_subdomain_edit.htm‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
55

66
<div class="pnl_formsarea">
77
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="domain">{tmpl_var name='domain_txt'}</label>
10-
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
11-
</div>
8+
<div class="ctrlHolder">
9+
<label for="domain">{tmpl_var name='host_txt'}</label>
10+
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
11+
</div>
12+
<div class="ctrlHolder">
13+
<label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
14+
<select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
15+
</div>
1216
<div class="ctrlHolder">
1317
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
1418
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">

0 commit comments

Comments
 (0)