From 5b3c29178704c047d4020df2ae445ff01c6e1f3a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 22 Jun 2015 08:48:27 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/sites/lib/lang/se_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/pl_resync.lng | 2
interface/web/sites/lib/lang/en_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/tools/lib/lang/it_resync.lng | 2
interface/web/sites/lib/lang/pl_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/fi_resync.lng | 2
interface/web/admin/lib/lang/es_system_config.lng | 1
interface/web/tools/lib/lang/cz_resync.lng | 2
interface/web/tools/lib/lang/nl_resync.lng | 2
interface/web/sites/lib/lang/es_web_vhost_domain.lng | 1
interface/web/sites/lib/lang/ro_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/ro_resync.lng | 2
interface/web/tools/lib/lang/en_resync.lng | 2
interface/web/tools/lib/lang/tr_resync.lng | 2
interface/web/sites/web_vhost_domain_edit.php | 5 +
interface/web/tools/lib/lang/de_resync.lng | 2
interface/web/sites/lib/lang/it_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/id_resync.lng | 2
interface/web/tools/resync.php | 25 ++++++++
interface/web/admin/lib/lang/de_system_config.lng | 1
interface/web/tools/lib/lang/es_resync.lng | 2
interface/web/sites/lib/lang/bg_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/hr_resync.lng | 2
interface/web/admin/form/system_config.tform.php | 6 ++
interface/web/admin/lib/lang/tr_system_config.lng | 1
interface/web/admin/lib/lang/hr_system_config.lng | 1
interface/web/admin/lib/lang/el_system_config.lng | 1
interface/web/admin/lib/lang/pl_system_config.lng | 1
interface/web/admin/lib/lang/fr_system_config.lng | 1
interface/web/tools/templates/resync.htm | 7 ++
interface/web/admin/lib/lang/ar_system_config.lng | 1
interface/web/admin/lib/lang/nl_system_config.lng | 1
interface/web/tools/lib/lang/el_resync.lng | 2
interface/web/admin/lib/lang/br_system_config.lng | 1
interface/web/admin/templates/system_config_misc_edit.htm | 5 +
interface/web/tools/lib/lang/se_resync.lng | 2
install/tpl/system.ini.master | 1
interface/web/sites/lib/lang/br_web_vhost_domain.lng | 1
interface/web/sites/lib/lang/pt_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/ar_resync.lng | 2
interface/web/tools/lib/lang/br_resync.lng | 2
interface/web/tools/lib/lang/sk_resync.lng | 2
interface/web/sites/templates/web_vhost_domain_edit.htm | 8 ++
interface/web/admin/lib/lang/id_system_config.lng | 1
interface/web/index.php | 3 +
interface/web/admin/lib/lang/cz_system_config.lng | 1
interface/web/admin/lib/lang/se_system_config.lng | 1
interface/web/tools/lib/lang/fr_resync.lng | 2
interface/web/admin/lib/lang/sk_system_config.lng | 1
interface/web/sites/lib/lang/el_web_vhost_domain.lng | 1
interface/web/admin/lib/lang/ja_system_config.lng | 1
interface/web/tools/lib/lang/hu_resync.lng | 2
interface/web/tools/lib/lang/bg_resync.lng | 2
interface/web/admin/lib/lang/bg_system_config.lng | 1
interface/web/admin/lib/lang/pt_system_config.lng | 1
interface/web/admin/lib/lang/en_system_config.lng | 1
interface/web/sites/lib/lang/nl_web_vhost_domain.lng | 1
interface/web/admin/lib/lang/it_system_config.lng | 1
interface/web/tools/lib/lang/ja_resync.lng | 2
interface/web/themes/default/templates/main.tpl.htm | 4
interface/web/sites/lib/lang/fi_web_vhost_domain.lng | 1
interface/web/sites/lib/lang/hr_web_vhost_domain.lng | 1
interface/web/admin/lib/lang/ru_system_config.lng | 1
interface/web/tools/lib/lang/pt_resync.lng | 2
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/admin/lib/lang/fi_system_config.lng | 1
interface/web/sites/lib/lang/tr_web_vhost_domain.lng | 1
interface/web/admin/lib/lang/ro_system_config.lng | 1
interface/web/sites/lib/lang/id_web_vhost_domain.lng | 1
interface/web/tools/lib/lang/ru_resync.lng | 2
interface/web/sites/lib/lang/cz_web_vhost_domain.lng | 1
interface/web/sites/lib/lang/hu_web_vhost_domain.lng | 1
interface/web/admin/lib/lang/hu_system_config.lng | 1
interface/web/sites/lib/lang/ru_web_vhost_domain.lng | 1
78 files changed, 150 insertions(+), 6 deletions(-)
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 92ae518..eb709c8 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -40,6 +40,7 @@
new_domain_html=Please contact our support to create a new domain for you.
[misc]
+company_name=
dashboard_atom_url_admin=http://www.ispconfig.org/atom
dashboard_atom_url_reseller=http://www.ispconfig.org/atom
dashboard_atom_url_client=http://www.ispconfig.org/atom
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index fabc180..3810e52 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -460,6 +460,12 @@
//#################################
// Begin Datatable fields
//#################################
+ 'company_name' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => ''
+ ),
'dashboard_atom_url_admin' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 61f7a79..712eb1d 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index a88c2ce..9429b7c 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 2a72018..c3e251c 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index ec1fae3..ed47296 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -71,5 +71,6 @@
$wb['No'] = 'Ne';
$wb['min_password_length_txt'] = 'Minimální délka hesla';
$wb['min_password_strength_txt'] = 'Minimální síla hesla';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 862fb56..bbeeb7a 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -72,4 +72,5 @@
$wb['No'] = 'Nein';
$wb['min_password_length_txt'] = 'Minimale Passwortlänge';
$wb['min_password_strength_txt'] = 'Minimale Passwortstärke';
+$wb["company_name_txt"] = "Firmenname fuer den Seitentitel";
?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index aa97d1e..d4de3d8 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index f446bb3..5d09b75 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -79,4 +79,5 @@
$wb["default_dnsserver_txt"] = 'Default DNS Server';
$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
$wb["default_dbserver_txt"] = 'Default Database Server';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index e51736b..6062467 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -76,4 +76,5 @@
$wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
$wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
$wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index 6e1239e..3eff3ac 100755
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index 1fb0643..19a5d8b 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 3827e3a..0096af0 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -71,6 +71,7 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index 37ca447..c590e33 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index d4f2625..513be30 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 9d00c8d..373ac3f 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index e81768d..ac36d31 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 6f1a6fb..2a0ea21 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -74,4 +74,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 4023906..b9cbe01 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 30d73f4..ccf91ee 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index d2d9193..d6e14ae 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index a3a610c..a66d1ac 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index 0a6a60b..662ca77 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'Nej';
$wb['min_password_length_txt'] = 'Minsta lösenordslängd';
$wb['min_password_strength_txt'] = 'Minsta lösenordsstyrka';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index 0a4c0ad..9f98b5e 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index d652b91..5ba42b9 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -71,4 +71,5 @@
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb["company_name_txt"] = "Company Name for the page title";
?>
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index e8b6889..d5dc139 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -12,6 +12,9 @@
<div class="col-sm-9" id="used_logo">{tmpl_var name='used_logo'}</div>
</div>
<div class="form-group">
+ <label for="page_title" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
<label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
<div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" /></div></div>
<div class="form-group">
@@ -183,4 +186,4 @@
});
}
-</script>
\ No newline at end of file
+</script>
diff --git a/interface/web/index.php b/interface/web/index.php
index 9838c24..7cdf5bd 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -101,6 +101,9 @@
$app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px');
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
+// Title
+$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+
$app->tpl_defaults();
$app->tpl->pparse();
?>
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..faee19a 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='document_root_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);
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index eea836c..c69b79d 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -3,7 +3,7 @@
<head>
<meta charset='utf-8' />
- <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+ <title><tmpl_var name="company_name"><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
<meta name='viewport' content='width=device-width, user-scalable=yes'>
<meta name='description' lang='en' content='' />
@@ -122,4 +122,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/ar_resync.lng
+++ b/interface/web/tools/lib/lang/ar_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/bg_resync.lng
+++ b/interface/web/tools/lib/lang/bg_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/br_resync.lng
+++ b/interface/web/tools/lib/lang/br_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
index 45d355a..6523727 100644
--- a/interface/web/tools/lib/lang/de_resync.lng
+++ b/interface/web/tools/lib/lang/de_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "E-Mail Sammeldienst";
?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/en_resync.lng b/interface/web/tools/lib/lang/en_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/en_resync.lng
+++ b/interface/web/tools/lib/lang/en_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/es_resync.lng
+++ b/interface/web/tools/lib/lang/es_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/fi_resync.lng
+++ b/interface/web/tools/lib/lang/fi_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/fr_resync.lng
+++ b/interface/web/tools/lib/lang/fr_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/hr_resync.lng
+++ b/interface/web/tools/lib/lang/hr_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/hu_resync.lng
+++ b/interface/web/tools/lib/lang/hu_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/id_resync.lng
+++ b/interface/web/tools/lib/lang/id_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/it_resync.lng
+++ b/interface/web/tools/lib/lang/it_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/ja_resync.lng
+++ b/interface/web/tools/lib/lang/ja_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/nl_resync.lng
+++ b/interface/web/tools/lib/lang/nl_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/pt_resync.lng
+++ b/interface/web/tools/lib/lang/pt_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/ro_resync.lng
+++ b/interface/web/tools/lib/lang/ro_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/ru_resync.lng
+++ b/interface/web/tools/lib/lang/ru_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/se_resync.lng
+++ b/interface/web/tools/lib/lang/se_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/sk_resync.lng
+++ b/interface/web/tools/lib/lang/sk_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng
index 78703c4..59767a1 100644
--- a/interface/web/tools/lib/lang/tr_resync.lng
+++ b/interface/web/tools/lib/lang/tr_resync.lng
@@ -44,4 +44,6 @@
$wb['btn_cancel_txt'] = 'Cancel';
$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
+$wb["do_mailget_txt"] = "Resynced Fetchmail";
+$wb["resync_mailget_txt"] = "Fetchmail";
?>
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index ef47fd7..1b2405d 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -97,6 +97,11 @@
'server_type' => 'mail',
'server_id' => $server_id,
),
+ 'mail_get' => array (
+ 'index_field' => 'mailget_id',
+ 'server_type' => 'mail',
+ 'server_id' => $server_id,
+ ),
'mail_mailinglist' => array (
'index_field' => 'mailinglist_id',
'server_type' => 'mail',
@@ -239,6 +244,17 @@
if ($server_count > 1) $options_servers = "<option value='0'>".$app->tform->wordbook['all_active_mail_txt']."</option>" . $options_servers;
$app->tpl->setVar('mail_server_id', $options_servers);
$app->tpl->setVar('mail_domain_found', 1);
+ unset($options_servers);
+ }
+
+ //* mail-get
+ $server_list = $this->create_list($mail_server_rec, 'mail', 'mail_get');
+ $options_servers = $server_list[0];$server_count = $server_list[1];
+ unset($server_list);
+ if (isset($options_servers)) { //* server with data found
+ if ($server_count > 1) $options_servers = "<option value='0'>".$app->tform->wordbook['all_active_mail_txt']."</option>" . $options_servers;
+ $app->tpl->setVar('mailget_server_id', $options_servers);
+ $app->tpl->setVar('mail_get_found', 1);
unset($options_servers);
}
@@ -460,6 +476,7 @@
$this->dataRecord['resync_cron'] = 1;
$this->dataRecord['resync_db'] = 1;
$this->dataRecord['resync_mail'] = 1;
+ $this->dataRecord['resync_mailget'] = 1;
$this->dataRecord['resync_mailbox'] = 1;
$this->dataRecord['resync_mailfilter'] = 1;
$this->dataRecord['resync_mailinglist'] = 1;
@@ -505,9 +522,15 @@
}
//* maildomains
- if($this->dataRecord['resync_mail'] == 1)
+ if($this->dataRecord['resync_mail'] == 1) {
$msg .= $this->do_resync('mail_domain', 'domain_id', 'mail', $this->dataRecord['mail_server_id'], 'domain', $app->tform->wordbook['do_mail_txt']);
$msg .= $this->do_resync('spamfilter_policy', 'id', 'mail', $this->dataRecord['mail_server_id'], '', $app->tform->wordbook['do_mail_spamfilter_policy_txt'], false);
+ }
+
+ //* mailget
+ if($this->dataRecord['resync_mailget'] == 1) {
+ $msg .= $this->do_resync('mail_get', 'mailget_id', 'mail', $this->dataRecord['mail_server_id'], 'source_username', $app->tform->wordbook['do_mailget_txt']);
+ }
//* mailbox
if($this->dataRecord['resync_mailbox'] == 1) {
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 48e20cc..6c368ed 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -75,6 +75,13 @@
<div class="col-sm-3"><select name="mailbox_server_id" id="mailbox_server_id" class="form-control">{tmpl_var name='mailbox_server_id'}</select></div>
</div>
</tmpl_if>
+ <tmpl_if name="mail_get_found">
+ <div class="form-group">
+ <div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mailget" value="1" name="resync_mailget"></div>
+ <label for="resync_mailget" class="col-sm-2 control-label">{tmpl_var name="resync_mailget_txt"}</label>
+ <div class="col-sm-3"><select name="mailget_server_id" id="mailget_server_id" class="form-control">{tmpl_var name='mailget_server_id'}</select></div>
+ </div>
+ </tmpl_if>
<tmpl_if name="mail_filter_found">
<div class="form-group">
<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_mailfilter" value="1" name="resync_mailfilter"></div>
--
Gitblit v1.9.1