Commit 5b3c2917 authored by Marius Cramer's avatar Marius Cramer

Merge branch 'master' into 'master'

Master

See merge request !203
parents 96c95ad8 eac49003
......@@ -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
......
......@@ -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',
......
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -11,6 +11,9 @@
<label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='used_logo_txt'}</label>
<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>
......@@ -183,4 +186,4 @@
});
}
</script>
\ No newline at end of file
</script>
......@@ -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();
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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">&nbsp;MB
......@@ -420,4 +426,4 @@
});
</tmpl_if>
</script>
\ No newline at end of file
</script>
......@@ -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);
......
......@@ -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>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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";
?>
......@@ -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 = "<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);
}
//* 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) {
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment