improve quarantine_report#1270
Merged
endelwar merged 3 commits intomailwatch:1.2from Dec 12, 2022
Merged
Conversation
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
|
Another great PR, thanks! I'll have some time this coming weekend to go over things. |
|
This one looks good, tested good as well. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.