From d73e9920773b9d001cc70384a3d7d75fadbcfa6b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Tue, 24 Mar 2009 11:22:29 -0400 Subject: [PATCH] Fixed subdomain form. --- install/sql/ispconfig3.sql | 2 interface/web/sites/templates/web_subdomain_edit.htm | 12 ++- interface/web/sites/lib/lang/en_web_domain.lng | 99 ++++++++++++------------ interface/web/sites/lib/lang/en_web_subdomain.lng | 75 +++++++++--------- 4 files changed, 96 insertions(+), 92 deletions(-) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index ab85872..b276abb 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -968,7 +968,7 @@ `suexec` enum('n','y') NOT NULL default 'y', `errordocs` tinyint(1) NOT NULL default '1', `is_subdomainwww` tinyint(1) NOT NULL default '1', - `subdomain` enum('none','www','*') NOT NULL default 'www', + `subdomain` enum('none','www','*') NOT NULL default 'none', `php` varchar(32) NOT NULL default 'y', `redirect_type` varchar(255) default NULL, `redirect_path` varchar(255) default NULL, diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index c27dbff..7a23f16 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -1,50 +1,49 @@ -<?php -$wb["ssl_state_txt"] = 'State'; -$wb["ssl_locality_txt"] = 'Locality'; -$wb["ssl_organisation_txt"] = 'Organisation'; -$wb["ssl_organisation_unit_txt"] = 'Organisation Unit'; -$wb["ssl_country_txt"] = 'Country'; -$wb["ssl_request_txt"] = 'SSL Request'; -$wb["ssl_cert_txt"] = 'SSL Certificate'; -$wb["ssl_bundle_txt"] = 'SSL Bundle'; -$wb["ssl_action_txt"] = 'SSL Action'; -$wb["server_id_txt"] = 'Server'; -$wb["domain_txt"] = 'Domain'; -$wb["type_txt"] = 'Type'; -$wb["parent_domain_id_txt"] = 'Parent Website'; -$wb["redirect_type_txt"] = 'Redirect Type'; -$wb["redirect_path_txt"] = 'Redirect Path'; -$wb["active_txt"] = 'Active'; -$wb["document_root_txt"] = 'Documentroot'; -$wb["system_user_txt"] = 'Linux User'; -$wb["system_group_txt"] = 'Linux Group'; -$wb["ip_address_txt"] = 'IP-Address'; -$wb["vhost_type_txt"] = 'VHost Type'; -$wb["hd_quota_txt"] = 'Harddisk Quota'; -$wb["traffic_quota_txt"] = 'Traffic Quota'; -$wb["cgi_txt"] = 'CGI'; -$wb["ssi_txt"] = 'SSI'; -$wb["errordocs_txt"] = 'Own Error-Documents'; -$wb["subdomain_txt"] = 'Auto-Subdomain'; -$wb["ssl_txt"] = 'SSL'; -$wb["suexec_txt"] = 'SuEXEC'; -$wb["php_txt"] = 'PHP'; -$wb["client_txt"] = 'Client'; -$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.'; -$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.'; -$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.'; -$wb["apache_directives_txt"] = 'Apache directives'; -$wb["domain_error_empty"] = 'Domain is empty.'; -$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.'; -$wb["domain_error_regex"] = 'Domain name invalid.'; -$wb["hd_quota_error_empty"] = 'Harddisk quota is empty.'; -$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.'; -$wb['error_ssl_state_empty'] = 'SSL State is empty.'; -$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.'; -$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.'; -$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.'; -$wb['error_ssl_country_empty'] = 'SSL Country is empty.'; -$wb["client_group_id_txt"] = 'Client'; -$wb["stats_password_txt"] = 'Webstatistics password'; - -?> +<?php +$wb["ssl_state_txt"] = 'State'; +$wb["ssl_locality_txt"] = 'Locality'; +$wb["ssl_organisation_txt"] = 'Organisation'; +$wb["ssl_organisation_unit_txt"] = 'Organisation Unit'; +$wb["ssl_country_txt"] = 'Country'; +$wb["ssl_request_txt"] = 'SSL Request'; +$wb["ssl_cert_txt"] = 'SSL Certificate'; +$wb["ssl_bundle_txt"] = 'SSL Bundle'; +$wb["ssl_action_txt"] = 'SSL Action'; +$wb["server_id_txt"] = 'Server'; +$wb["domain_txt"] = 'Domain'; +$wb["type_txt"] = 'Type'; +$wb["parent_domain_id_txt"] = 'Parent Website'; +$wb["redirect_type_txt"] = 'Redirect Type'; +$wb["redirect_path_txt"] = 'Redirect Path'; +$wb["active_txt"] = 'Active'; +$wb["document_root_txt"] = 'Documentroot'; +$wb["system_user_txt"] = 'Linux User'; +$wb["system_group_txt"] = 'Linux Group'; +$wb["ip_address_txt"] = 'IP-Address'; +$wb["vhost_type_txt"] = 'VHost Type'; +$wb["hd_quota_txt"] = 'Harddisk Quota'; +$wb["traffic_quota_txt"] = 'Traffic Quota'; +$wb["cgi_txt"] = 'CGI'; +$wb["ssi_txt"] = 'SSI'; +$wb["errordocs_txt"] = 'Own Error-Documents'; +$wb["subdomain_txt"] = 'Auto-Subdomain'; +$wb["ssl_txt"] = 'SSL'; +$wb["suexec_txt"] = 'SuEXEC'; +$wb["php_txt"] = 'PHP'; +$wb["client_txt"] = 'Client'; +$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.'; +$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.'; +$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.'; +$wb["apache_directives_txt"] = 'Apache directives'; +$wb["domain_error_empty"] = 'Domain is empty.'; +$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.'; +$wb["domain_error_regex"] = 'Domain name invalid.'; +$wb["hd_quota_error_empty"] = 'Harddisk quota is empty.'; +$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.'; +$wb['error_ssl_state_empty'] = 'SSL State is empty.'; +$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.'; +$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.'; +$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.'; +$wb['error_ssl_country_empty'] = 'SSL Country is empty.'; +$wb["client_group_id_txt"] = 'Client'; +$wb["stats_password_txt"] = 'Webstatistics password'; +?> diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng index d028a71..ef71003 100644 --- a/interface/web/sites/lib/lang/en_web_subdomain.lng +++ b/interface/web/sites/lib/lang/en_web_subdomain.lng @@ -1,38 +1,39 @@ -<?php -$wb["ssl_state_txt"] = 'State'; -$wb["ssl_locality_txt"] = 'Locality'; -$wb["ssl_organisation_txt"] = 'Organisation'; -$wb["ssl_organisation_unit_txt"] = 'Organisation Unit'; -$wb["ssl_country_txt"] = 'Country'; -$wb["ssl_request_txt"] = 'SSL Request'; -$wb["ssl_cert_txt"] = 'SSL Certificate'; -$wb["ssl_bundle_txt"] = 'SSL Bundle'; -$wb["ssl_action_txt"] = 'SSL Action'; -$wb["server_id_txt"] = 'Server'; -$wb["domain_txt"] = 'Domain'; -$wb["type_txt"] = 'Type'; -$wb["parent_domain_id_txt"] = 'Parent Website'; -$wb["redirect_type_txt"] = 'Redirect Type'; -$wb["redirect_path_txt"] = 'Redirect Path'; -$wb["active_txt"] = 'Active'; -$wb["document_root_txt"] = 'Documentroot'; -$wb["system_user_txt"] = 'Linux User'; -$wb["system_group_txt"] = 'Linux Group'; -$wb["ip_address_txt"] = 'IP-Address'; -$wb["vhost_type_txt"] = 'VHost Type'; -$wb["hd_quota_txt"] = 'Harddisk Quota'; -$wb["traffic_quota_txt"] = 'Traffic Quaota'; -$wb["cgi_txt"] = 'CGI'; -$wb["ssi_txt"] = 'SSI'; -$wb["ssl_txt"] = 'SSL'; -$wb["suexec_txt"] = 'SuEXEC'; -$wb["php_txt"] = 'PHP'; -$wb["client_txt"] = 'Client'; -$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.'; -$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.'; -$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.'; -$wb["apache_directives_txt"] = 'Apache directives'; -$wb["domain_error_empty"] = 'Domain is empty.'; -$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.'; -$wb["domain_error_regex"] = 'Domain name invalid.'; +<?php +$wb["ssl_state_txt"] = 'State'; +$wb["ssl_locality_txt"] = 'Locality'; +$wb["ssl_organisation_txt"] = 'Organisation'; +$wb["ssl_organisation_unit_txt"] = 'Organisation Unit'; +$wb["ssl_country_txt"] = 'Country'; +$wb["ssl_request_txt"] = 'SSL Request'; +$wb["ssl_cert_txt"] = 'SSL Certificate'; +$wb["ssl_bundle_txt"] = 'SSL Bundle'; +$wb["ssl_action_txt"] = 'SSL Action'; +$wb["server_id_txt"] = 'Server'; +$wb["domain_txt"] = 'Domain'; +$wb["type_txt"] = 'Type'; +$wb["parent_domain_id_txt"] = 'Parent Website'; +$wb["redirect_type_txt"] = 'Redirect Type'; +$wb["redirect_path_txt"] = 'Redirect Path'; +$wb["active_txt"] = 'Active'; +$wb["document_root_txt"] = 'Documentroot'; +$wb["system_user_txt"] = 'Linux User'; +$wb["system_group_txt"] = 'Linux Group'; +$wb["ip_address_txt"] = 'IP-Address'; +$wb["vhost_type_txt"] = 'VHost Type'; +$wb["hd_quota_txt"] = 'Harddisk Quota'; +$wb["traffic_quota_txt"] = 'Traffic Quaota'; +$wb["cgi_txt"] = 'CGI'; +$wb["ssi_txt"] = 'SSI'; +$wb["ssl_txt"] = 'SSL'; +$wb["suexec_txt"] = 'SuEXEC'; +$wb["php_txt"] = 'PHP'; +$wb["client_txt"] = 'Client'; +$wb["limit_web_domain_txt"] = 'The max. number of web domains for your account is reached.'; +$wb["limit_web_aliasdomain_txt"] = 'The max. number of aliasdomains for your account is reached.'; +$wb["limit_web_subdomain_txt"] = 'The max. number of web subdomains for your account is reached.'; +$wb["apache_directives_txt"] = 'Apache directives'; +$wb["domain_error_empty"] = 'Domain is empty.'; +$wb["domain_error_unique"] = 'There is already a website or sub / aliasdomain with this domain name.'; +$wb["domain_error_regex"] = 'Domain name invalid.'; +$wb["host_txt"] = 'Host'; ?> \ No newline at end of file diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm index 7c08fc0..2206cf7 100644 --- a/interface/web/sites/templates/web_subdomain_edit.htm +++ b/interface/web/sites/templates/web_subdomain_edit.htm @@ -5,10 +5,14 @@ <div class="pnl_formsarea"> <fieldset class="inlineLabels"> - <div class="ctrlHolder"> - <label for="domain">{tmpl_var name='domain_txt'}</label> - <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" /> - </div> + <div class="ctrlHolder"> + <label for="domain">{tmpl_var name='host_txt'}</label> + <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" /> + </div> + <div class="ctrlHolder"> + <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label> + <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select> + </div> <div class="ctrlHolder"> <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label> <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf"> -- Gitblit v1.9.1