Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve quarantine_report #1270

Merged
merged 3 commits into from
Dec 12, 2022
Merged

improve quarantine_report #1270

merged 3 commits into from
Dec 12, 2022

Conversation

dneuhaeuser
Copy link
Contributor

@dneuhaeuser dneuhaeuser commented Nov 8, 2022

Having administrator users defined with one or more filter addresses (e.g. automatically imported from LDAP with mailwatch_ldap_sync.sh) led to quarantine reports with duplicate lines.

So when the user type is 'A' we must NOT iterate through the filters because administrators get a report for every single recipient anyway.

Also the administrator's report had an incomplete headline because a suitable string was missing ($list_for was set empty).
I suggest using the system's hostname in this case.

For normal users, when sending combined reports the headline should only list the addresses which are contained in the current report. Otherwise this gets very messy when you have a lot of address filters defined for a user.

Having administrator users defined with one or more filter adresses (e.g. automatically imported from LDAP with mailwatch_ldap_sync.sh) led to quarantine reports with duplicate lines.

So when the user type is 'A' we must NOT iterate through the filters because administrators get a report for every single recipient anyway.

Also the administrator's report only had a partial headline because a suitable string was missing ($list_for was set empty). I suggest using the system's hostname in this case.

When sending _combined_ user reports the headline should only contain adresses which are contained in the currenct report. Otherwise this can get very messy when you have multiple adress filters defined for a user.
correct indentations
@dneuhaeuser dneuhaeuser marked this pull request as ready for review November 8, 2022 12:56
@shawniverson
Copy link
Member

Another great PR, thanks! I'll have some time this coming weekend to go over things.

@shawniverson
Copy link
Member

This one looks good, tested good as well.

@endelwar endelwar merged commit 57f412e into mailwatch:1.2 Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants