From 78ff6b206785e449800bd000add2925f02bc40be Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 13 Nov 2020 15:20:56 +0100
Subject: [PATCH] Add fields for purge_junk_days and purge_trash_days

This was added in ISPconfig 3.2
---
 ispconfig3_spam/ispconfig3_spam.php    | 17 ++++++++++++++++-
 ispconfig3_spam/localization/en_US.inc |  4 +++-
 ispconfig3_spam/localization/nl_NL.inc |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ispconfig3_spam/ispconfig3_spam.php b/ispconfig3_spam/ispconfig3_spam.php
index 4271826..f7d3da9 100644
--- a/ispconfig3_spam/ispconfig3_spam.php
+++ b/ispconfig3_spam/ispconfig3_spam.php
@@ -110,6 +110,8 @@ function save()
             }
 
             $params['move_junk'] = $move_junk;
+            $params['purge_junk_days'] = rcube_utils::get_input_value('_purge_junk_days', rcube_utils::INPUT_POST);
+            $params['purge_trash_days'] = rcube_utils::get_input_value('_purge_trash_days', rcube_utils::INPUT_POST);
 
             $update = $this->soap->mail_user_update($session_id, $uid, $mail_user[0]['mailuser_id'], $params);
             $this->soap->logout($session_id);
@@ -163,6 +165,9 @@ function gen_form($attrib)
             $enabled = $mail_user[0]['move_junk'];
             if ($enabled == 'y')
                 $enabled = 1;
+
+            $purge_junk_days = $mail_user[0]['purge_junk_days'];
+            $purge_trash_days = $mail_user[0]['purge_trash_days'];
         }
         catch (SoapFault $e) {
             $error = $this->rc->text_exists($e->getMessage(), $this->ID) ? $this->gettext($e->getMessage()) : $e->getMessage();
@@ -181,8 +186,18 @@ function gen_form($attrib)
         $input_spammove = new html_checkbox(array('name' => '_' . $field_id, 'id' => $field_id, 'value' => '1'));
         $table->add('title', html::label($field_id, rcube::Q($this->gettext('spammove'))));
         $table->add('', $input_spammove->show($enabled));
-        $out .= $table->show();
 
+        $field_id = 'purge_junk_days';
+        $input_purge_junk_days = new html_inputfield(array('name' => '_' . $field_id, 'id' => $field_id, 'size' => '10'));
+        $table->add('title', html::label($field_id, rcube::Q($this->gettext('purge_junk_days'))));
+        $table->add('', $input_purge_junk_days->show($purge_junk_days));
+
+        $field_id = 'purge_trash_days';
+        $input_purge_trash_days = new html_inputfield(array('name' => '_' . $field_id, 'id' => $field_id, 'size' => '10'));
+        $table->add('title', html::label($field_id, rcube::Q($this->gettext('purge_trash_days'))));
+        $table->add('', $input_purge_trash_days->show($purge_trash_days));
+
+        $out .= $table->show();
         $out .= "</fieldset>\n";
 
         return $out;
diff --git a/ispconfig3_spam/localization/en_US.inc b/ispconfig3_spam/localization/en_US.inc
index 80fdc04..9b61732 100644
--- a/ispconfig3_spam/localization/en_US.inc
+++ b/ispconfig3_spam/localization/en_US.inc
@@ -6,4 +6,6 @@ $labels['policy_entries'] = 'Available policies';
 $labels['policy_tag'] = 'Tag level';
 $labels['policy_tag2'] = 'Tag2 level';
 $labels['policy_kill'] = 'Kill level';
-$labels['spamnopolicies'] = 'No policies available';
\ No newline at end of file
+$labels['spamnopolicies'] = 'No policies available';
+$labels['purge_junk_days'] = 'Purge Junk automatically after X days';
+$labels['purge_trash_days'] = 'Purge Trash automatically after X days';
diff --git a/ispconfig3_spam/localization/nl_NL.inc b/ispconfig3_spam/localization/nl_NL.inc
index f3ec212..2c03c0b 100644
--- a/ispconfig3_spam/localization/nl_NL.inc
+++ b/ispconfig3_spam/localization/nl_NL.inc
@@ -7,3 +7,5 @@ $labels['policy_tag'] = 'Tag level';
 $labels['policy_tag2'] = 'Tag2 level';
 $labels['policy_kill'] = 'Kill level';
 $labels['spamnopolicies'] = 'Geen policies beschikbaar';
+$labels['purge_junk_days'] = 'Verwijder uit de Junk map automatisch na X dagen';
+$labels['purge_trash_days'] = 'Verwijder uit de Prullenbak automatisch na X dagen';