mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
Merge branch 'ent-9992-9740-introducir-el-boton-de-email-test-en-la-configuracion-de-correo-de-la-metaconsola' into 'develop'
Ent 9992 [#9740] Introducir el botón de email test en la configuración de correo de la Metaconsola See merge request artica/pandorafms!6901
This commit is contained in:
Rafael Ameijeiras
commit
f65acbd4f3
@ -960,60 +960,6 @@ echo '<legend>'.__('Mail configuration').'</legend>';
|
|||||||
);
|
);
|
||||||
|
|
||||||
echo '</form>';
|
echo '</form>';
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Print the modal window for the summary of each alerts group
|
|
||||||
*
|
|
||||||
* @param string $id Id.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
function print_email_test_modal_window($id)
|
|
||||||
{
|
|
||||||
// Email config table.
|
|
||||||
$table_mail_test = new stdClass();
|
|
||||||
$table_mail_test->width = '100%';
|
|
||||||
$table_mail_test->class = 'filter-table-adv';
|
|
||||||
$table_mail_test->data = [];
|
|
||||||
|
|
||||||
$table_mail_test->data[0][] = html_print_label_input_block(
|
|
||||||
__('Address'),
|
|
||||||
html_print_input_text(
|
|
||||||
'email_test_address',
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
35,
|
|
||||||
100,
|
|
||||||
true
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
$table_mail_test->data[1][] = '  <span id="email_test_sent_message" class="invisible"><b>Email sent</b></span><span id="email_test_failure_message" class=invisible"><b>Email could not be sent</b></span>';
|
|
||||||
|
|
||||||
// $table_mail_test->colspan[2][0] = 2;
|
|
||||||
$submitButton = html_print_div(
|
|
||||||
[
|
|
||||||
'class' => 'action-buttons-right-forced',
|
|
||||||
'content' => html_print_button(
|
|
||||||
__('Send'),
|
|
||||||
'email_test',
|
|
||||||
false,
|
|
||||||
'',
|
|
||||||
[
|
|
||||||
'icon' => 'cog',
|
|
||||||
'mode' => 'mini',
|
|
||||||
],
|
|
||||||
true
|
|
||||||
),
|
|
||||||
],
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).$submitButton.'</div>';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function show_timezone () {
|
function show_timezone () {
|
||||||
@ -1033,62 +979,6 @@ function show_timezone () {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_email_test(id) {
|
|
||||||
$('#email_test_sent_message').hide();
|
|
||||||
$('#email_test_failure_message').hide();
|
|
||||||
|
|
||||||
$("#email_test_"+id).dialog({
|
|
||||||
resizable: true,
|
|
||||||
draggable: true,
|
|
||||||
modal: true,
|
|
||||||
width: 450,
|
|
||||||
overlay: {
|
|
||||||
opacity: 0.5,
|
|
||||||
background: "black"
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function perform_email_test () {
|
|
||||||
$('#email_test_sent_message').hide();
|
|
||||||
$('#email_test_failure_message').hide();
|
|
||||||
|
|
||||||
var test_address = $('#text-email_test_address').val();
|
|
||||||
params = {
|
|
||||||
email_smtpServer : $('#text-email_smtpServer').val(),
|
|
||||||
email_smtpPort : $('#text-email_smtpPort').val(),
|
|
||||||
email_username : $('#text-email_username').val(),
|
|
||||||
email_password : $('#password-email_password').val(),
|
|
||||||
email_encryption : $( "#email_encryption option:selected" ).val(),
|
|
||||||
email_from_dir : $('#text-email_from_dir').val(),
|
|
||||||
email_from_name : $('#text-email_from_name').val()
|
|
||||||
};
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
type: "POST",
|
|
||||||
url: "ajax.php",
|
|
||||||
data : {
|
|
||||||
page: "godmode/setup/setup_general",
|
|
||||||
test_address: test_address,
|
|
||||||
params: params
|
|
||||||
},
|
|
||||||
dataType: "json",
|
|
||||||
success: function(data) {
|
|
||||||
if (parseInt(data) === 1) {
|
|
||||||
$('#email_test_sent_message').show();
|
|
||||||
$('#email_test_failure_message').hide();
|
|
||||||
} else {
|
|
||||||
$('#email_test_failure_message').show();
|
|
||||||
$('#email_test_sent_message').hide();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
error: function() {
|
|
||||||
$('#email_test_failure_message').show();
|
|
||||||
$('#email_test_sent_message').hide();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$(document).ready (function () {
|
$(document).ready (function () {
|
||||||
|
|
||||||
$("#zone").attr("hidden", true);
|
$("#zone").attr("hidden", true);
|
||||||
@ -1146,8 +1036,6 @@ $(document).ready (function () {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
$('#button-email_test').click(perform_email_test);
|
|
||||||
|
|
||||||
$("#right_iblacklist").click (function () {
|
$("#right_iblacklist").click (function () {
|
||||||
jQuery.each($("select[name='inventory_changes_blacklist_out[]'] option:selected"), function (key, value) {
|
jQuery.each($("select[name='inventory_changes_blacklist_out[]'] option:selected"), function (key, value) {
|
||||||
imodule_name = $(value).html();
|
imodule_name = $(value).html();
|
||||||
|
|||||||
@ -7691,3 +7691,52 @@ function html_print_wizard_diagnosis(
|
|||||||
echo $output;
|
echo $output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Print the modal window for the summary of each alerts group
|
||||||
|
*
|
||||||
|
* @param string $id Id.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
function print_email_test_modal_window($id)
|
||||||
|
{
|
||||||
|
// Email config table.
|
||||||
|
$table_mail_test = new stdClass();
|
||||||
|
$table_mail_test->width = '100%';
|
||||||
|
$table_mail_test->class = 'filter-table-adv';
|
||||||
|
$table_mail_test->data = [];
|
||||||
|
$table_mail_test->data[0][] = html_print_label_input_block(
|
||||||
|
__('Address'),
|
||||||
|
html_print_input_text(
|
||||||
|
'email_test_address',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
35,
|
||||||
|
100,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$table_mail_test->data[1][] = '  <span id="email_test_sent_message" class="invisible"><b>Email sent</b></span><span id="email_test_failure_message" class=invisible"><b>Email could not be sent</b></span>';
|
||||||
|
// $table_mail_test->colspan[2][0] = 2;
|
||||||
|
$submitButton = html_print_div(
|
||||||
|
[
|
||||||
|
'class' => 'action-buttons-right-forced',
|
||||||
|
'content' => html_print_button(
|
||||||
|
__('Send'),
|
||||||
|
'email_test',
|
||||||
|
false,
|
||||||
|
'perform_email_test()',
|
||||||
|
[
|
||||||
|
'icon' => 'cog',
|
||||||
|
'mode' => 'mini',
|
||||||
|
],
|
||||||
|
true
|
||||||
|
),
|
||||||
|
],
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
|
echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).$submitButton.'</div>';
|
||||||
|
}
|
||||||
|
|||||||
@ -2621,3 +2621,60 @@ function christmas_click(flagEasternEgg) {
|
|||||||
}, 120000);
|
}, 120000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function perform_email_test() {
|
||||||
|
$("#email_test_sent_message").hide();
|
||||||
|
$("#email_test_failure_message").hide();
|
||||||
|
|
||||||
|
var test_address = $("#text-email_test_address").val();
|
||||||
|
var params = {
|
||||||
|
email_smtpServer: $("#text-email_smtpServer").val(),
|
||||||
|
email_smtpPort: $("#text-email_smtpPort").val(),
|
||||||
|
email_username: $("#text-email_username").val(),
|
||||||
|
email_password: $("#password-email_password").val(),
|
||||||
|
email_encryption: $("#email_encryption option:selected").val(),
|
||||||
|
email_from_dir: $("#text-email_from_dir").val(),
|
||||||
|
email_from_name: $("#text-email_from_name").val()
|
||||||
|
};
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: "POST",
|
||||||
|
url: "ajax.php",
|
||||||
|
data: {
|
||||||
|
page: "godmode/setup/setup_general",
|
||||||
|
test_address: test_address,
|
||||||
|
params: params
|
||||||
|
},
|
||||||
|
dataType: "json",
|
||||||
|
success: function(data) {
|
||||||
|
if (parseInt(data) === 1) {
|
||||||
|
$("#email_test_sent_message").show();
|
||||||
|
$("#email_test_failure_message").hide();
|
||||||
|
} else {
|
||||||
|
console.log($("#email_test_failure_message"));
|
||||||
|
$("#email_test_failure_message").show();
|
||||||
|
$("#email_test_sent_message").hide();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function() {
|
||||||
|
$("#email_test_failure_message").show();
|
||||||
|
$("#email_test_sent_message").hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function show_email_test(id) {
|
||||||
|
$("#email_test_sent_message").hide();
|
||||||
|
$("#email_test_failure_message").hide();
|
||||||
|
|
||||||
|
$("#email_test_" + id).dialog({
|
||||||
|
resizable: true,
|
||||||
|
draggable: true,
|
||||||
|
modal: true,
|
||||||
|
width: 450,
|
||||||
|
overlay: {
|
||||||
|
opacity: 0.5,
|
||||||
|
background: "black"
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user