Skip to content

Commit c40524c

Browse files
florian030florian030
committed
purge trash and junk (Implements #5634)
1 parent 20e52c3 commit c40524c

30 files changed

+250
-13
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo / Comodo CA' WHERE `ca_issue` = 'co
2020
-- default php-fpm to ondemand mode
2121
ALTER TABLE `web_domain` ALTER pm SET DEFAULT 'ondemand';
2222

23+
ALTER TABLE `mail_user`
24+
ADD `purge_trash_days` INT NOT NULL DEFAULT '0' AFTER `move_junk`,
25+
ADD `purge_junk_days` INT NOT NULL DEFAULT '0' AFTER `purge_trash_days`;

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,8 @@ CREATE TABLE `mail_user` (
10471047
`autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply',
10481048
`autoresponder_text` mediumtext NULL,
10491049
`move_junk` enum('n','y') NOT NULL default 'n',
1050+
`purge_trash_days` INT NOT NULL DEFAULT '0',
1051+
`purge_junk_days` INT NOT NULL DEFAULT '0',
10501052
`custom_mailfilter` mediumtext,
10511053
`postfix` enum('n','y') NOT NULL default 'y',
10521054
`greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',

‎interface/web/mail/form/mail_user.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,20 @@
406406
'default' => 'n',
407407
'value' => array(0 => 'n', 1 => 'y')
408408
),
409+
'purge_trash_days' => array (
410+
'datatype' => 'VARCHAR',
411+
'formtype' => 'TEXT',
412+
'validators' => array (
413+
),
414+
'default' => '0',
415+
),
416+
'purge_junk_days' => array (
417+
'datatype' => 'VARCHAR',
418+
'formtype' => 'TEXT',
419+
'validators' => array (
420+
),
421+
'default' => '0',
422+
),
409423
//#################################
410424
// END Datatable fields
411425
//#################################

‎interface/web/mail/lib/lang/ar_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['sender_cc_txt'] = 'Send outgoing BCC to';
6262
$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
6363
$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
6464
$wb['password_click_to_set_txt'] = 'Click to set';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/bg_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['weekly_backup_txt'] = 'Weekly';
6262
$wb['monthly_backup_txt'] = 'Monthly';
6363
$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
6464
$wb['password_click_to_set_txt'] = 'Click to set';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/br_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['monthly_backup_txt'] = 'Mensal';
6262
$wb['email_error_isascii'] = 'Por favor, não use caracteres especiais para a senha. Isto poderá causar problemas no cliente de e-mail.';
6363
$wb['cc_note_txt'] = '(separar múltiplos endereços de e-mails com vírgulas)';
6464
$wb['sender_cc_note_txt'] = '(separar múltiplos endereços de e-mails com vírgulas)';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/ca_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['weekly_backup_txt'] = 'Weekly';
6262
$wb['monthly_backup_txt'] = 'Monthly';
6363
$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
6464
$wb['password_click_to_set_txt'] = 'Click to set';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/cz_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['weekly_backup_txt'] = 'Týdenní';
6262
$wb['monthly_backup_txt'] = 'Měsíční';
6363
$wb['sender_cc_note_txt'] = '(Při posílání kopií na více e-mailových adres, oddělte čárkami.) ';
6464
$wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/de_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['sender_cc_txt'] = 'Kopie ausgehender Emails senden an (BCC)';
6262
$wb['sender_cc_error_isemail'] = '-Kopie ausgehender Emails senden an- Feld enthält keine gültige Emailadresse';
6363
$wb['sender_cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
6464
$wb['password_click_to_set_txt'] = 'Click to set';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

‎interface/web/mail/lib/lang/dk_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ $wb['daily_backup_txt'] = 'Daily';
6262
$wb['weekly_backup_txt'] = 'Weekly';
6363
$wb['monthly_backup_txt'] = 'Monthly';
6464
$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
65+
$wb['purge_trash_days_txt'] = 'Purge Trash automatically after X days';
66+
$wb['tooltip_purge_trash_days_txt'] = '0 = disabled';
67+
$wb['purge_junk_days_txt'] = 'Purge Junk automatically after X days';
68+
$wb['tooltip_purge_junk_days_txt'] = '0 = disabled';
6569
?>

0 commit comments

Comments
 (0)