Skip to content

Commit

Permalink
Merge pull request cypht-org#902 from josaphatim/fix-smtp-composer
Browse files Browse the repository at this point in the history 
Fixed smtp compose form not working
  • Loading branch information
@Shadow243
Shadow243 authored Feb 19, 2024
2 parents 3bcf6a7 + 7fd4041 commit 46f052c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 31 deletions.
2 changes: 1 addition & 1 deletion modules/smtp/hm-smtp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function service_connect($id, $server, $user, $pass, $cache=false)
if (array_key_exists('no_auth', $server)) {
$config['no_auth'] = true;
}
self::$server_list[]['object'] = new Hm_SMTP($config);
self::$server_list[$id]['object'] = new Hm_SMTP($config);

if (!end(self::$server_list)['object']->connect()) {
return end(self::$server_list)['object'];
Expand Down
2 changes: 1 addition & 1 deletion modules/smtp/modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ protected function output() {

$res .= '</table>'.
smtp_server_dropdown($this->module_output(), $this, $recip, $selected_id).
'<input class="smtp_send btn btn-success mt-3" type="submit" value="'.$this->trans('Send').'" name="smtp_send" '.$send_disabled.'/>';
'<button class="smtp_send_placeholder btn btn-success mt-3" type="button" '.$send_disabled.'>'.$this->trans('Send').'</button><input class="smtp_send d-none" type="submit" value="'.$this->trans('Send').'" name="smtp_send"/>';

if ($this->get('list_path') && ($reply_type == 'reply' || $reply_type == 'reply_all')) {
$res .= '<input class="smtp_send_archive btn btn-success mt-3" type="button" value="'.$this->trans('Send & Archive').'" name="smtp_send" '.$send_disabled.'/>';
Expand Down
60 changes: 31 additions & 29 deletions modules/smtp/site.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ var smtp_delete_draft = function(id) {

var send_archive = function() {
$('.compose_post_archive').val(1);
document.getElementsByClassName("smtp_send")[0].click();
document.getElementsByClassName("smtp_send_placeholder")[0].click();
}

var save_compose_state = function(no_files, notice) {
Expand All @@ -139,8 +139,8 @@ var save_compose_state = function(no_files, notice) {
return;
}

$('.smtp_send').prop('disabled', true);
$('.smtp_send').addClass('disabled_input');
$('.smtp_send_placeholder').prop('disabled', true);
$('.smtp_send_placeholder').addClass('disabled_input');
Hm_Ajax.request(
[{'name': 'hm_ajax_hook', 'value': 'ajax_smtp_save_draft'},
{'name': 'draft_body', 'value': body},
Expand All @@ -155,8 +155,8 @@ var save_compose_state = function(no_files, notice) {
{'name': 'draft_to', 'value': to},
{'name': 'uploaded_files', 'value': uploaded_files}],
function(res) {
$('.smtp_send').prop('disabled', false);
$('.smtp_send').removeClass('disabled_input');
$('.smtp_send_placeholder').prop('disabled', false);
$('.smtp_send_placeholder').removeClass('disabled_input');
if (res.draft_id) {
$('.compose_draft_id').val(res.draft_id);
}
Expand Down Expand Up @@ -402,14 +402,14 @@ var process_compose_form = function(){
var uploaded_files = $("input[name='uploaded_files[]']").map(function () { return $(this).val(); }).get();
$('#send_uploaded_files').val(uploaded_files);
Hm_Ajax.show_loading_icon();
$('.smtp_send').addClass('disabled_input');
$('.smtp_send_placeholder').addClass('disabled_input');
$('.smtp_send_archive').addClass('disabled_input');
$('.smtp_send').on("click", function () { return false; });
}
var force_send_message = function(){
var force_send_message = function() {
// Check if the force_send input already exists
var forceSendInput = document.getElementById('force_send');
if (!forceSendInput) {
if (! forceSendInput) {
// Create a hidden input element
var hiddenInput = document.createElement('input');
hiddenInput.type = 'hidden';
Expand All @@ -420,10 +420,7 @@ var force_send_message = function(){
// Append the hidden input to the form
var form = document.querySelector('.compose_form');
form.appendChild(hiddenInput);

}
// Trigger the click event for the "Send" button
document.querySelector('.smtp_send').click()
}

$(function () {
Expand Down Expand Up @@ -457,8 +454,7 @@ $(function () {
btnSize: 'sm'
});

$('.compose_form').on('submit', function(e) {
e.preventDefault();
$('.smtp_send_placeholder').on("click", function (e) {
const body = $('.compose_body').val().trim();
const subject = $('.compose_subject').val().trim();

Expand All @@ -485,15 +481,16 @@ $(function () {

// If the user has disabled the warning, we should send the message
if (Boolean(Hm_Utils.get_from_local_storage(dontWanValueInStorage))) {
return handleSendAnyway();
handleSendAnyway();
}
// Otherwise, we should show the modal if we have a headline
if (modalContentHeadline) {
return showModal();
else if (modalContentHeadline) {
return showModal(modalContentHeadline);
}

// Subject and body are not empty, we can send the message
handleSendAnyway();
else {
handleSendAnyway();
}

/*
========================================
Expand All @@ -510,21 +507,24 @@ $(function () {
}

function handleSendAnyway() {
// e.target.submit();
handleFiles();
if (handleMissingAttachment()) {
document.getElementsByClassName("smtp_send")[0].click();
} else {
e.preventDefault();
}
};

function handleSendAnywayAndDontWarnMe() {
Hm_Utils.save_to_local_storage(dontWanValueInStorage, true);
handleSendAnyway();
};

function handleFiles() {
function handleMissingAttachment() {
var uploaded_files = $("input[name='uploaded_files[]']").map(function () { return $(this).val(); }).get();
const compose_body_value = document.getElementById('compose_body').value;
const force_send = document.getElementById('force_send')?.value;
var reminder_value = $('.compose_form').data('reminder');
if (reminder_value === 1) {
if (reminder_value === 1 && force_send !== '1') {
let all_translated_keywords = [];
for (let lang in window.hm_translations) {
if (window.hm_translations.hasOwnProperty(lang)) {
Expand All @@ -540,19 +540,21 @@ $(function () {
// Build the regex pattern
const pattern = new RegExp('(' + combined_keywords.map(keyword => keyword.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')).join('|') + ')', 'i');
// Check if the pattern is found in the message
if (pattern.test(compose_body_value) && uploaded_files.length === 0 && force_send !== '1') {
if (pattern.test(compose_body_value) && uploaded_files.length === 0) {

if (confirm(hm_trans('We couldn\'t find the attachment you referred to. Please confirm if you attached it or provide the details again.'))) {
force_send_message();
} else {
return false;
}
e.preventDefault();
} else {
process_compose_form();
}
} else {
process_compose_form();
}
return true;
}
});
$('.compose_form').on('submit', function() {
process_compose_form();
});
if ($('.compose_cc').val() || $('.compose_bcc').val()) {
toggle_recip_flds();
}
Expand Down Expand Up @@ -585,7 +587,7 @@ $(function () {
e.preventDefault();
text_to_bubbles(this);
});
$('.compose_subject, .compose_body, .compose_server, .smtp_send, .smtp_send_archive').on('focus', function(e) {
$('.compose_subject, .compose_body, .compose_server, .smtp_send_placeholder, .smtp_send_archive').on('focus', function(e) {
$('.compose_to, .compose_cc, .compose_bcc').each(function() {
bubbles_to_text(this);
});
Expand Down

0 comments on commit 46f052c

Please sign in to comment.