From 568b4b12d291f928b0755f130df026ba6ecfa656 Mon Sep 17 00:00:00 2001 From: Florian Schaal <florian@schaal-24.de> Date: Sat, 20 Jun 2015 05:11:02 -0400 Subject: [PATCH] display the documnet_root for a website --- interface/web/sites/lib/lang/se_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/br_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/en_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/pt_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/fr_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/ja_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/pl_web_vhost_domain.lng | 1 + interface/web/sites/templates/web_vhost_domain_edit.htm | 8 +++++++- interface/web/sites/lib/lang/es_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/el_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/ro_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/nl_web_vhost_domain.lng | 1 + interface/web/sites/web_vhost_domain_edit.php | 5 ++++- interface/web/sites/lib/lang/it_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/fi_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/hr_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/bg_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/de_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/ar_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/sk_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/tr_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/id_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/cz_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/hu_web_vhost_domain.lng | 1 + interface/web/sites/lib/lang/ru_web_vhost_domain.lng | 1 + 25 files changed, 34 insertions(+), 2 deletions(-) diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index f9e4b0e..37fdba6 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -134,4 +134,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index a35a575..3b151fd 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index 4628490..aec6e8b 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index e05bfed..b298081 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -138,5 +138,6 @@ $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['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng index 7917cae..c8c6355 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng @@ -140,4 +140,5 @@ $wb['load_client_data_txt'] = 'Kundendaten übernehmen'; $wb['load_my_data_txt'] = 'Meine Kontaktdaten laden'; $wb['reset_client_data_txt'] = 'Daten verwerfen'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index 1259343..e5bb4ae 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index 8af57ff..20e85e3 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -143,4 +143,5 @@ $wb['load_client_data_txt'] = 'Load client details'; $wb['load_my_data_txt'] = 'Load my contact details'; $wb['reset_client_data_txt'] = 'Reset data'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index c59c2d1..e74f218 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -133,4 +133,5 @@ $wb['backup_excludes_note_txt'] = '(Separa múltiples directorios con comas. Ejemplo: web/cache/*,web/backup)'; $wb['backup_excludes_error_regex'] = 'Los directorios excluídos contienen caracteres no válidos.'; $wb['invalid_custom_php_ini_settings_txt'] = 'Configuración personalizada de php.ini no válida'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng old mode 100755 new mode 100644 index 7a7e2e2..5c9a965 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index e12bc76..7d96c79 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -136,4 +136,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index 409355f..0bc966c 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -133,6 +133,7 @@ $wb['backup_excludes_error_regex'] = 'Izbačeni direktorij sadrži nedozvoljene znakove.'; $wb['invalid_custom_php_ini_settings_txt'] = 'Neispravne php.ini postavke'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index e2c6a84..58d99e2 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index 920710f..fc54166 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index 81b6778..018310b 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index f7c26c0..0508dcb 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index 3a3657c..0cc80e6 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index 523a4f9..5f8455b 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index c2ead6a..82f2ea7 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index 6ae4526..d0a52d9 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index a304e2d..d5de443 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index f6ad635..2f76ef9 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Ogiltiga php.ini-inställningar'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index 43a33e1..f3ee50b 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index db2887b..8d4b082 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -135,4 +135,5 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings'; $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group'; $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:'; +$wb["document_root_txt"] = "Document Root"; ?> diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm index 801c69f..7daf34e 100644 --- a/interface/web/sites/templates/web_vhost_domain_edit.htm +++ b/interface/web/sites/templates/web_vhost_domain_edit.htm @@ -89,6 +89,12 @@ <tmpl_else> <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if> </div> + <tmpl_if name="edit_disabled"> + <div class="form-group"> + <label for="document_root" class="col-sm-3 control-label" readonly >{tmpl_var name='ip_address_txt'}</label> + <div class="col-sm-9">{tmpl_var name='document_root'}</div> + </div> + </tmpl_if> <div class="form-group"> <label for="hd_quota" class="col-sm-3 control-label">{tmpl_var name='hd_quota_txt'}</label> <div class="col-sm-6"><input type="text" name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB @@ -420,4 +426,4 @@ }); </tmpl_if> -</script> \ No newline at end of file +</script> diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php index a4a5a39..c1a726a 100644 --- a/interface/web/sites/web_vhost_domain_edit.php +++ b/interface/web/sites/web_vhost_domain_edit.php @@ -647,7 +647,10 @@ //* we are editing a existing record $app->tpl->setVar("edit_disabled", 1); $app->tpl->setVar('fixed_folder', 'y'); - if($this->_vhostdomain_type == 'domain') $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]); + if($this->_vhostdomain_type == 'domain') { + $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]); + $app->tpl->setVar("document_root", $this->dataRecord["document_root"]); + } else $app->tpl->setVar('server_id_value', $parent_domain['server_id']); } else { $app->tpl->setVar("edit_disabled", 0); -- Gitblit v1.9.1