fix(other): screen email: fix adding to trust contact while the email is blo… #1265
Conversation
This file contains 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
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
4e5f6c9 to
ab14f8d
Compare
|
@christer77 please rebase to fix failing tests. |
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
2 times, most recently
from
543849a to
8b8ffb6
Compare
Shadow243
reviewed
Oct 9, 2024
Shadow243
reviewed
Oct 9, 2024
Shadow243
reviewed
Oct 9, 2024
Shadow243
reviewed
Oct 9, 2024
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
8b8ffb6 to
3b3122a
Compare
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
3b3122a to
2a6f525
Compare
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
2a6f525 to
8afda19
Compare
Shadow243
reviewed
Nov 6, 2024
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
8afda19 to
c31c7d6
Compare
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
2 times, most recently
from
88ef6b3 to
ff8bf62
Compare
Shadow243
reviewed
Nov 25, 2024
christer77
changed the title
christer77
changed the title
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
ff8bf62 to
6e9ef23
Compare
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
6e9ef23 to
6109e25
Compare
christer77
changed the title
christer77
changed the title
marclaporte
reviewed
Dec 17, 2024
marclaporte
reviewed
Dec 17, 2024
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
6109e25 to
bc9657f
Compare
marclaporte
reviewed
Dec 20, 2024
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
bc9657f to
d1d728c
Compare
kroky
reviewed
Jan 7, 2025
kroky
reviewed
Jan 7, 2025
kroky
reviewed
Jan 7, 2025
kroky
reviewed
Jan 7, 2025
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
2 times, most recently
from
e843f56 to
d8d1d71
Compare
kroky
reviewed
Jan 10, 2025
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
d8d1d71 to
f847402
Compare
kroky
reviewed
Jan 13, 2025
christer77
force-pushed
the
fix-Adding-to-Trust-Contact-while-the-email-adress-is-blocked
branch
from
f847402 to
de710ee
Compare
mercihabam
reviewed
Jan 16, 2025
Comment on lines
+1360
to
1433
| function get_list_block_sieve() { | ||
| sessionStorage.removeItem('list_blocked'); | ||
| var detail = Hm_Utils.parse_folder_path(hm_list_path()); | ||
| var list_blocked_senders = []; | ||
| var page = hm_page_name(); | ||
| if (page == 'message_list') { | ||
| Hm_Ajax.request( | ||
| [ | ||
| { name: 'hm_ajax_hook', value: 'ajax_list_block_sieve' }, | ||
| { name: 'imap_server_id', 'value': detail.server_id}, | ||
| ], | ||
| function (res) { | ||
| if (res.ajax_list_block_sieve) { | ||
| sessionStorage.setItem('list_blocked', res.ajax_list_block_sieve); | ||
| } | ||
| } | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| $('.screen-email-unlike').on("click", function() { imap_screen_email(); return false; }); | ||
|
|
||
| $('.screen-email-like').on("click", function() { | ||
| var list_blocked_senders = (sessionStorage.getItem('list_blocked') !== null) ? JSON.parse(sessionStorage.getItem('list_blocked')) : []; | ||
| var list_email = []; | ||
| var list_msg_uid = []; | ||
| var email_existing_in_blocked_senders = []; | ||
| $('input[type=checkbox]').each(function() { | ||
| if (this.checked && this.id.search('imap') != -1) { | ||
| let email = $('.'+ this.id +' .from').attr("data-title") | ||
| if (email = email.trim()) { | ||
| list_email.push(email); | ||
| if (list_blocked_senders.length > 0) { | ||
| list_blocked_senders.forEach((sender, index) => { | ||
| if (sender === email) { | ||
| email_existing_in_blocked_senders.push(email); | ||
| list_msg_uid.push($(this).parent().parent().attr("data-uid")); | ||
| delete list_blocked_senders[index]; | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
| add_email_in_contact_trusted(list_email); return false; | ||
|
|
||
| if (email_existing_in_blocked_senders) { | ||
| var list_html = "<ol>"; | ||
| email_existing_in_blocked_senders.forEach(sender => { | ||
| sender = sender.trim(); | ||
| list_html += `<li>${sender}</li>`; | ||
| }); | ||
| list_html += "</ol>"; | ||
| const modal = new Hm_Modal({ | ||
| modalId: 'emptySubjectBodyModal', | ||
| title: 'Warning', | ||
| btnSize: 'sm' | ||
| }); | ||
|
|
||
| var modalContentHeadline = "Adress mail exist in your Block list"; | ||
| modal.addFooterBtn(hm_trans('Add Emails to Trust contact'), 'btn-warning', handleAddEmail); | ||
| modal.setContent(modalContentHeadline + list_html + `<p>${hm_trans('If you add these, all will be unblocked.<br>Are you sure you want to add this in your Trust contact?')}</p>`); | ||
| modal.open(); | ||
| function handleAddEmail() { | ||
| list_msg_uid.forEach(function(msg_uid) { | ||
| block_unblock_sender(msg_uid, Hm_Utils.parse_folder_path(hm_list_path()), 'sender', 'unblocked'); | ||
| }); | ||
| modal.hide(); | ||
| add_email_in_contact_trusted(list_email); | ||
| }; | ||
| } else { | ||
| add_email_in_contact_trusted(list_email); | ||
| } | ||
| return false; | ||
| }); |
There was a problem hiding this comment.
@christer77 This should not be called when the module "sievefilters" is disabled. Please move it to its appropriate module.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR resolves issue's points 4 and 5