diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index 92ae518697a8a1938f5ae9219c2bd634da6d2945..eb709c8da2f5db8332f8bff7087e34c083a857a0 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -40,6 +40,7 @@ use_domain_module=n 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 fabc180b04c11ca14641aefc485680b12922c4d6..3810e52bad6f575eb006a7e30c43f89738454687 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -460,6 +460,12 @@ $form["tabs"]['misc'] = array ( //################################# // 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 61f7a791c69d0f0a5d3e76b331f6eaacfc203d60..712eb1d85928165d9017c0cd6535c973c0db1f5f 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 a88c2cec3a2e8b6ec09c3dd3a2de4a8506d90367..9429b7c2f70c8b6e4cce9bc93ec4eabe6a5f07e2 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 2a7201882971d0d2c99b38e9905caeaa48bf5424..c3e251cb5dda34bbbb75b32eab4e2aba0d9ae790 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 ec1fae36f51b01224317e03231e3778231d9584d..ed47296c1f87018e559ee1836907a726f04a5208 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['session_allow_endless_txt'] = 'Povolit - zůstat přihlášen'; $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 862fb569fe926f839b47d3657a5f60d5935aaa09..bbeeb7ab1dff5d66ccb9841086fe0f758ffe2df6 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['session_allow_endless_txt'] = '"Eingeloggt bleiben" aktivieren'; $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 aa97d1e28b590d54a9396f9d5835eae531107606..d4de3d89638a1394b4d297e47df8b4e266b03587 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 f446bb3ed7aa6c2d6c67517b4f494e5efe098332..5d09b755a152dfeb1959b12c32d7449f849a21c5 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_webserver_txt"] = 'Default Webserver'; $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 e51736b7fee90c22ce0600e681e3177e1b09ea79..606246778aee443240bcf04a1863ffe13904f212 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_webserver_txt'] = 'Servidor web por defecto'; $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 6e1239e51ed45bc39d4e97b132c0d7061207c4dd..3eff3ac330160028d0a21c40f08aee61178c5b54 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 1fb0643fce20db56db49fe9ed7b65e06db29ea27..19a5d8b8106a7785ec08cc6e48006618b99ca8a9 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 3827e3a5ba732c4d11d3e1b94ad281f168c854f2..0096af0f9158b7013613f2b2faccc03913497b8e 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 37ca447bf8cecfe9b0e6e32f751528b70c23362b..c590e33fc1a9f008fd6494d1196159eee448200c 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 d4f262573db50ce6e0afa931b2ac6c5f0bf316bf..513be3090b809207be6477e3881e30ccbb1cc48c 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 9d00c8d75a43e0d0ab13f5e43cb1224994329bae..373ac3f2c0defd340fbab62950a5f95e7d2863b4 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 e81768d8750b1dc7ac78ca9d5a7baa87a6733f22..ac36d311d3ac715830b7e7bc7ae697eb5f91f43e 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 6f1a6fb514e828508635eed3d6e1276e6c22e714..2a0ea2167fcca0cb33d205dce75efb681b8a5791 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 402390688fc55f57c1ec047bdf1757eb91d111d0..b9cbe01cbf903000a2c107e9f9b550390e0999db 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 30d73f45b2b5c112235ef9f9b612742accecd996..ccf91ee45d51b455eaead2a59c291df9df400a52 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 d2d91931d0ffce018c319bf82c5fe224a42a236c..d6e14ae4422518563fd2af1067eabc2e44cdd5ba 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 a3a610c3b0b5aee1f5187ca3312cd0a74289288f..a66d1ac168d990fe60abb0ccf158fd062355e43e 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 0a6a60b7228ba0065c5276516dcfc5e458323d47..662ca7786e9197f4c23391d3a625d7f011a6af84 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['session_allow_endless_txt'] = 'Aktivera \\"håll mig inloggad\\"'; $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 0a4c0adaccd8a80baa92fad18e216a24e7fa64f2..9f98b5eedfd203c09ca3d3777b8350a1ca3f5879 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 d652b915e57b72ff7f2c6207c52d2565dad35766..5ba42b9397e9a7593c5a9bbd53589443bf0db082 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['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"'; $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 e8b6889de20af2a11be4de53ecde2daa9a12c570..d5dc139ccac613e034d25879b6af645e4dbc058e 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -11,6 +11,9 @@ +
+ +
@@ -183,4 +186,4 @@ }); } - \ No newline at end of file + diff --git a/interface/web/index.php b/interface/web/index.php index 9838c2414929db0d87aafe8c06072b90889767f0..7cdf5bd06e65dd59677e0852a446bed92076531f 100644 --- a/interface/web/index.php +++ b/interface/web/index.php @@ -101,6 +101,9 @@ $app->tpl->setVar('base64_logo_width', $logo_dimensions[0].'px'); $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 f9e4b0edd752e2ee03bda4f849f0ccb408048461..37fdba60467e194733be0c3415c6a9c11d794562 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 a35a5752acd7cceb277a278db51b955ed6cfd179..3b151fdecd95e16a9460f694a9544a8394320e03 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 4628490e809d66ff2d69c75fc68cd982ac8a062d..aec6e8bccc488116b20e29c159c75e14420126c8 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 e05bfedf1454890273cb183c701c82d87f0f2aa4..b2980815ce152dffe1d21b622b0b2656b010ffa8 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_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['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 7917cae90d7eb7b8abe813beab2627fd11dd76c5..c8c6355b57d06354767fb8d53d019bb283a25867 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['enable_spdy_txt'] = 'Aktiviere SPDY'; $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 1259343ce8feb5f15b66b8c8cc08bbd486ec302f..e5bb4aedd7ec9ac695962d46b21e3b93ad3a4324 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 8af57ff82771011cdc49ebe92c07ebabd0590a45..20e85e37651c56bb36aad011e3c30ec15e3da953 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['enable_spdy_txt'] = 'Enable SPDY'; $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 c59c2d12ada40c6d6bf078ae17c5337706a1b32f..e74f21884fff58232081974d6d1d4a3c7c5bbc5b 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_txt'] = 'Directorios excluídos'; $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 7a7e2e27eb173f77301b21f47c8ee6ba459d5172..5c9a9658a1445fabf0e49ad2610826e0f076290d --- 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 e12bc7634eab703133afc272ea3bb082fcea1639..7d96c79e75f833770b285ebea5768b300a8b3f3b 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 409355f6215fa1b11a7138ff59e053a501a6ea05..0bc966cd8f708af81e5a92c9507145c7f98d358a 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_note_txt'] = '(Separate multiple directories with commas. E $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 e2c6a84d5a6c8129cabc864f5d1d2db2b1d4142a..58d99e21628172cb34a87a8968b66efc66df1326 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 920710f250b71772fcac7b8df73dbfa26a37d3d8..fc54166fe1661a5233209f5f0b5b0771125937b6 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 81b6778aca89d45092663e7f13dd769ad63195dc..018310b996830d7935ccf74dcd80b1e2fdd59e67 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 f7c26c04aec853ec4b91797ac3d98c388985a94a..0508dcb90ed9df0942ead61b3f9dee728e34afb1 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 3a3657cd1711b8954adee7de9c85ea4b54c36e86..0cc80e6e13c251ff4cdee34b328d3fb8051f6f85 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 523a4f91013be16c68a103afffbbf09e914bd8cd..5f8455b68e08346d0d918e426f01c14c7f2b141e 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 c2ead6a5fca3dbfca9659054ef60170fdcc0d99f..82f2ea7ca3eb458bd183363e12d1e1a3c5679018 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 6ae4526f618a6738905ccc874d9568caf4168df3..d0a52d92e481f27b3e00f75f969ebf09af14157e 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 a304e2dfa874c39f0e385cd92a54b9a164785eda..d5de443a9fe182c609a71fd1c96d847f8517f903 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 f6ad635115295b8ddccd37cbefc1de68f43c09e7..2f76ef9e13f55e7a8ba95f7862559e1e1b656195 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 43a33e1eeea6a0f231785f11f3d306f74fe55bcb..f3ee50b26ff3746a2f1bd6bf891b513c75038085 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 db2887bb7a6c50322bcf1840545711dbd5e65ecf..8d4b0820bd2b49671f75140103d3159119725998 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['backup_excludes_error_regex'] = 'The excluded directories contain invalid c $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 801c69f1e26232b688af800868c2eccf6796b8b4..faee19a92e5ad47202daaa509e6b666d504ec096 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_var name='document_root'}
+
+
 MB @@ -420,4 +426,4 @@ }); - \ No newline at end of file + diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php index a4a5a3931b0814957bd5e1dfef12bc8426748753..c1a726aebc8dab35819cadd961244a1e82c6a809 100644 --- a/interface/web/sites/web_vhost_domain_edit.php +++ b/interface/web/sites/web_vhost_domain_edit.php @@ -647,7 +647,10 @@ class page_action extends tform_actions { //* 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 eea836cc30014b085bf78f75fa17d1a2439332e2..c69b79db3fb2069f251c3240407c0f54bdeb6fe1 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -3,7 +3,7 @@ - <tmpl_var name="app_title"> <tmpl_var name="app_version"> + <tmpl_var name="company_name"><tmpl_var name="app_title"> <tmpl_var name="app_version"> @@ -122,4 +122,4 @@ - \ No newline at end of file + diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng index 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 45d355a093c26c09276eb33e54792872cc417e14..6523727a161c747987dc61bd026b3d0611480aef 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 78703c414c7014e857e68f1465cd972e8e3fc8d4..59767a134ab9fa16ea2a2807689a328705bc3d6f 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_start_txt'] = 'Start'; $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 ef47fd731e03c07a33e858551cf4dd44f0ecaca9..1b2405db42094c275b1f13519d11518c2de7ad88 100644 --- a/interface/web/tools/resync.php +++ b/interface/web/tools/resync.php @@ -97,6 +97,11 @@ class page_action extends tform_actions { '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', @@ -242,6 +247,17 @@ class page_action extends tform_actions { 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 = "" . $options_servers; + $app->tpl->setVar('mailget_server_id', $options_servers); + $app->tpl->setVar('mail_get_found', 1); + unset($options_servers); + } + //* mailbox $server_list = $this->create_list($mail_server_rec, 'mail', 'mail_user'); $options_servers = $server_list[0];$server_count = $server_list[1]; @@ -460,6 +476,7 @@ class page_action extends tform_actions { $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 @@ class page_action extends tform_actions { } //* 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 48e20cc8510b3f799cd3366dbf3b19ba65ee07ea..6c368ede6b2e8abd1ced56668522d7ab93dd7d6c 100644 --- a/interface/web/tools/templates/resync.htm +++ b/interface/web/tools/templates/resync.htm @@ -75,6 +75,13 @@
+ +
+
+ +
+
+