external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-04-02 21:37:23 +02:00
Code Issues Releases Wiki Activity

Merge ae96f6f5e6 into d7244ed920

Browse Source
This commit is contained in:
Md. Ishtiaq Ashiq
2022-08-27 16:12:15 +09:00
committed by GitHub
parent d7244ed920 ae96f6f5e6
commit 88f521d697
11 changed files with 270 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
management/templates/index.html
View File

@@ -256,17 +256,17 @@ $(function() {
// so that we don't attempt to show another modal while this one
// is closing.
global_modal_state = 0; // OK
})
});
$('#global_modal .btn-default').click(function() {
global_modal_state = 1; // Cancel
})
});
$('#global_modal').on('hidden.bs.modal', function (e) {
// do the cancel function
if (global_modal_state == null) global_modal_state = 1; // cancel if the user hit ESC or clicked outside of the modal
if (global_modal_funcs && global_modal_funcs[global_modal_state])
global_modal_funcs[global_modal_state]();
})
})
});
function show_modal_error(title, message, callback) {
$('#global_modal h4').text(title);
@@ -286,7 +286,7 @@ function show_modal_error(title, message, callback) {
return false; // handy when called from onclick
}
function show_modal_confirm(title, question, verb, yes_callback, cancel_callback) {
function show_modal_confirm(title, question, verb, yes_callback, cancel_callback, extra_callback=null) {
$('#global_modal h4').text(title);
if (typeof question == 'string') {
$('#global_modal .modal-dialog').addClass("modal-sm");
@@ -303,7 +303,8 @@ function show_modal_confirm(title, question, verb, yes_callback, cancel_callback
$('#global_modal .btn-default').show().text(verb[1]);
$('#global_modal .btn-danger').show().text(verb[0]);
}
global_modal_funcs = [yes_callback, cancel_callback];
if (extra_callback) global_modal_funcs = [yes_callback, cancel_callback, extra_callback];
else global_modal_funcs = [yes_callback, cancel_callback];
global_modal_state = null;
$('#global_modal').modal({});
return false; // handy when called from onclick

94
management/templates/ssl.html
View File

@@ -40,7 +40,10 @@
<h3 id="ssl_install_header">Install certificate</h3>
<p>If you don't want to use our automatic Let's Encrypt integration, you can give any other certificate provider a try. You can generate the needed CSR below.</p>
<p>If you don't want to use our automatic Let's Encrypt integration, you can give any other certificate provider a try. Click on install certificate button
if there is no certificate for your intended domain or
click on renew or replace certificate button and click replace if there is an existing certificate and you want to replace it with a new one from a different CA.
You can generate the needed CSR below.</p>
<p>Which domain are you getting a certificate for?</p>
@@ -101,7 +104,8 @@ function show_tls(keep_provisioning_shown) {
$('#ssldomain').html('<option value="">(select)</option>');
$('#ssl_domains').show();
for (var i = 0; i < domains.length; i++) {
var row = $("<tr><th class='domain'><a href=''></a></th><td class='status'></td> <td class='actions'><a href='#' onclick='return ssl_install(this);' class='btn btn-xs'>Install Certificate</a></td></tr>");
var row = $("<tr><th class='domain'><a href=''></a></th><td class='status'></td> " +
"<td class='actions'><a href='#' onclick='return ssl_install(this);' class='btn btn-xs'>Install Certificate</a></td></tr>");
tb.append(row);
row.attr('data-domain', domains[i].domain);
row.find('.domain a').text(domains[i].domain);
@@ -113,7 +117,10 @@ function show_tls(keep_provisioning_shown) {
row.addClass("text-" + domains[i].status);
row.find('.status').text(domains[i].text);
if (domains[i].status == "success") {
row.find('.actions a').addClass('btn-default').text('Replace Certificate');
row.find('.actions a').addClass('btn-default').text('Renew or replace Certificate');
row.find('.actions a').addClass('btn-default').on("click", function () {
ssl_renew_or_replace_modal(this);
});
} else {
row.find('.actions a').addClass('btn-primary').text('Install Certificate');
}
@@ -130,6 +137,87 @@ function ssl_install(elem) {
$('html, body').animate({ scrollTop: $('#ssl_install_header').offset().top - $('.navbar-fixed-top').height() - 20 })
return false;
}
let flag = false;
function ssl_renew_or_replace_modal(elem) {
if (!flag) {
$('#global_modal .modal-footer').append('<button type="button" class="btn btn-warning" data-dismiss="modal">Renew</button>');
flag = true;
}
$('#global_modal .btn-warning').click(function() {
global_modal_state = 2; // Renew
});
show_modal_confirm(
"Options",
"Do you want to replace the certificate with a new one or just renew this one?",
"Replace",
function () {
$('#global_modal .modal-footer .btn-warning').remove();
flag = false;
ssl_install(elem);
}, function() {$('#global_modal .modal-footer .btn-warning').remove();flag = false;},
function () {
$('#global_modal .modal-footer .btn-warning').remove();
flag = false;
ssl_cert_renew(elem);
});
}
function ssl_cert_renew(elem) {
if (!flag) {
$('#global_modal .modal-footer').append('<button type="button" class="btn btn-warning" data-dismiss="modal">Yes</button>');
flag = true;
}
$('#global_modal .btn-warning').click(function() {
global_modal_state = 2; // Renew
});
var domain = $(elem).parents('tr').attr('data-domain');
show_modal_confirm(
"Renewing options",
"Do you want to renew with the existing key?",
"No",
function () {
$('#global_modal .modal-footer .btn-warning').remove();flag = false;
$('#ajax_loading_indicator').show();
api(
"/ssl/renew/" + domain,
"POST",
{
existing_key: "no"
},
function(data) {
$('#ajax_loading_indicator').stop(true).hide();
show_modal_error(data["title"], data["log"]);
show_tls(true);
},
function () {
$('#ajax_loading_indicator').stop(true).hide();
show_modal_error("Error", "Something is not right, sorry!");
show_tls(true);
}
);
}, function() {$('#global_modal .modal-footer .btn-warning').remove();flag = false;},
function () {
$('#global_modal .modal-footer .btn-warning').remove();
flag = false;
$('#ajax_loading_indicator').show();
api(
"/ssl/renew/" + domain,
"POST",
{
existing_key: "yes"
},
function(data) {
$('#ajax_loading_indicator').stop(true).hide();
show_modal_error(data["title"], data["log"]);
show_tls(true);
},
function () {
$('#ajax_loading_indicator').stop(true).hide();
show_modal_error("Error", "Something is not right, sorry!");
show_tls(true);
});
},);
}
function show_csr() {
// Can't show a CSR until both inputs are entered.