From a246ffd76e02519a11bbe8bc0c332c185049835c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 9 Apr 2014 21:03:45 +0200
Subject: [PATCH] - changed default for delete emails after retrieval in
getmail form to no and added a info text.
---
interface/web/mail/form/mail_get.tform.php | 2 +-
interface/web/mail/lib/lang/de_mail_get.lng | 1 +
interface/web/mail/lib/lang/en_mail_get.lng | 1 +
interface/web/mail/templates/mail_get_edit.htm | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/form/mail_get.tform.php b/interface/web/mail/form/mail_get.tform.php
index 7ed96994b4..a74ff23931 100644
--- a/interface/web/mail/form/mail_get.tform.php
+++ b/interface/web/mail/form/mail_get.tform.php
@@ -129,7 +129,7 @@ $form["tabs"]['mailget'] = array (
'source_delete' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'source_read_all' => array (
diff --git a/interface/web/mail/lib/lang/de_mail_get.lng b/interface/web/mail/lib/lang/de_mail_get.lng
index e97ee28add..cf15a18ff7 100644
--- a/interface/web/mail/lib/lang/de_mail_get.lng
+++ b/interface/web/mail/lib/lang/de_mail_get.lng
@@ -5,6 +5,7 @@ $wb['source_server_txt'] = 'POP3/IMAP Server';
$wb['source_username_txt'] = 'Benutzername';
$wb['source_password_txt'] = 'Passwort';
$wb['source_delete_txt'] = 'E-Mails nach Empfang löschen';
+$wb["source_delete_note_txt"] = 'Bitte prüfen Sie erst, ob das Abholen funktioniert, bevor Sie diese Option aktivieren.';
$wb['destination_txt'] = 'Ziel';
$wb['active_txt'] = 'Aktiv';
$wb['limit_fetchmail_txt'] = 'Die maximale Anzahl an Sammelkonto Einträgen für Ihr Konto wurde erreicht.';
diff --git a/interface/web/mail/lib/lang/en_mail_get.lng b/interface/web/mail/lib/lang/en_mail_get.lng
index 85bf147558..60c88ae3c9 100644
--- a/interface/web/mail/lib/lang/en_mail_get.lng
+++ b/interface/web/mail/lib/lang/en_mail_get.lng
@@ -5,6 +5,7 @@ $wb["source_server_txt"] = 'Pop3/Imap Server';
$wb["source_username_txt"] = 'Username';
$wb["source_password_txt"] = 'Password';
$wb["source_delete_txt"] = 'Delete emails after retrieval';
+$wb["source_delete_note_txt"] = 'Please check first if email retrieval works, before you activate this option.';
$wb["source_read_all_txt"] = 'Retrieve all emails (incl. read mails)';
$wb["destination_txt"] = 'Destination';
$wb["active_txt"] = 'Active';
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index e1cba90269..1f5e6a936b 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -26,7 +26,7 @@
<div class="ctrlHolder">
<p class="label">{tmpl_var name='source_delete_txt'}</p>
<div class="multiField">
- {tmpl_var name='source_delete'}
+ {tmpl_var name='source_delete'} {tmpl_var name="source_delete_note_txt"}
</div>
</div>
<div class="ctrlHolder">
--
GitLab