From f2d15aa1719c2030578a1f62b9eb05271c9199c5 Mon Sep 17 00:00:00 2001 From: RvdH Date: Sun, 2 May 2021 23:06:18 +0200 Subject: [PATCH 01/34] Update core.js check emailaddress forwarding account --- hMailAdmin/js/core.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hMailAdmin/js/core.js b/hMailAdmin/js/core.js index 43f42f8..92e3901 100644 --- a/hMailAdmin/js/core.js +++ b/hMailAdmin/js/core.js @@ -535,6 +535,10 @@ $.fn.validation = function() { action = form.attr('action'); button.prop('disabled', true).addClass('wait').width(width).text('.'); + + if ($('#forwardaddress').length) { + $('#forwardaddress').toggleClass( 'req', $('#forwardenabled').is(':checked') ); + } $('.req', this).each(function() { var input = $(this).val(); From fbe80236b81e7cc50708d5d33608a0b5255e1217 Mon Sep 17 00:00:00 2001 From: RvdH Date: Sun, 2 May 2021 23:15:39 +0200 Subject: [PATCH 02/34] Update hm_account.php Oops forgot the other file --- hMailAdmin/hm_account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hMailAdmin/hm_account.php b/hMailAdmin/hm_account.php index c10d76c..83999e0 100644 --- a/hMailAdmin/hm_account.php +++ b/hMailAdmin/hm_account.php @@ -174,7 +174,7 @@ From 66d63645ae6f379763844751b3bd0f5a76a7926c Mon Sep 17 00:00:00 2001 From: RvdH Date: Mon, 3 May 2021 11:09:34 +0200 Subject: [PATCH 03/34] Update core.js A few more conditional checks, there a probably plenty more but this is a good start --- hMailAdmin/js/core.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/hMailAdmin/js/core.js b/hMailAdmin/js/core.js index 92e3901..91724df 100644 --- a/hMailAdmin/js/core.js +++ b/hMailAdmin/js/core.js @@ -536,9 +536,27 @@ $.fn.validation = function() { button.prop('disabled', true).addClass('wait').width(width).text('.'); - if ($('#forwardaddress').length) { + // conditional checks + if ($('#forwardenabled').length) { $('#forwardaddress').toggleClass( 'req', $('#forwardenabled').is(':checked') ); } + if ($('#DKIMSignEnabled').length) { + $('#DKIMPrivateKeyFile').toggleClass( 'req', $('#DKIMSignEnabled').is(':checked') ); + $('#DKIMSelector').toggleClass( 'req', $('#DKIMSignEnabled').is(':checked') ); + } + if ($('#clamwinenabled').length) { + $('#clamwinexecutable').toggleClass( 'req', $('#clamwinenabled').is(':checked') ); + $('#clamwindbfolder').toggleClass( 'req', $('#clamwinenabled').is(':checked') ); + } + if ($('#ClamAVEnabled').length) { + $('#ClamAVHost').toggleClass( 'req', $('#ClamAVEnabled').is(':checked') ); + } + if ($('#customscannerenabled').length) { + $('#customscannerexecutable').toggleClass( 'req', $('#customscannerenabled').is(':checked') ); + } + if ($('#SpamAssassinEnabled').length) { + $('#SpamAssassinHost').toggleClass( 'req', $('#SpamAssassinEnabled').is(':checked') ); + } $('.req', this).each(function() { var input = $(this).val(); From d28a384e3aa09ad717f9cc91e37550d685a9636d Mon Sep 17 00:00:00 2001 From: RvdH Date: Fri, 8 Oct 2021 12:14:48 +0200 Subject: [PATCH 04/34] Additions Additions to make it compatible with 5.6.8-B2574.40 --- hMailAdmin/background_domain_save.php | 7 +++++++ hMailAdmin/hm_distributionlist.php | 1 + hMailAdmin/hm_domain.php | 3 +++ hMailAdmin/hm_mirror.php | 2 +- hMailAdmin/hm_ssltls.php | 15 ++++++++++++++- hMailAdmin/include/functions.php | 9 +++++++-- hMailAdmin/include_versioncheck.php | 8 +------- 7 files changed, 34 insertions(+), 11 deletions(-) diff --git a/hMailAdmin/background_domain_save.php b/hMailAdmin/background_domain_save.php index 3977763..351ac0e 100644 --- a/hMailAdmin/background_domain_save.php +++ b/hMailAdmin/background_domain_save.php @@ -32,6 +32,7 @@ $MaxNumberOfDistributionListsEnabled = hmailGetVar("MaxNumberOfDistributionListsEnabled","0"); $DKIMSignEnabled = hmailGetVar("DKIMSignEnabled", "0"); +$DKIMSignAliasesEnabled = hmailGetVar("DKIMSignAliasesEnabled", "0"); $DKIMPrivateKeyFile = hmailGetVar("DKIMPrivateKeyFile", ""); $DKIMSelector = hmailGetVar("DKIMSelector", ""); @@ -72,6 +73,12 @@ $obDomain->AddSignaturesToReplies = $AddSignaturesToReplies; $obDomain->DKIMSignEnabled = $DKIMSignEnabled; +if ($obDomain->DomainAliases->Count > 0){ + $obDomain->DKIMSignAliasesEnabled = $DKIMSignAliasesEnabled; +} +else { + $obDomain->DKIMSignAliasesEnabled = 0; +} $obDomain->DKIMPrivateKeyFile = $DKIMPrivateKeyFile; $obDomain->DKIMSelector = $DKIMSelector; $obDomain->DKIMHeaderCanonicalizationMethod = $DKIMHeaderCanonicalizationMethod; diff --git a/hMailAdmin/hm_distributionlist.php b/hMailAdmin/hm_distributionlist.php index 713159a..c783074 100644 --- a/hMailAdmin/hm_distributionlist.php +++ b/hMailAdmin/hm_distributionlist.php @@ -59,6 +59,7 @@ MaxNumberOfAliasesEnabled; $MaxNumberOfDistributionListsEnabled = $obDomain->MaxNumberOfDistributionListsEnabled; $DKIMSignEnabled = $obDomain->DKIMSignEnabled; + $DKIMSignAliasesEnabled = $obDomain->DomainAliases->Count > 0 ? $obDomain->DKIMSignAliasesEnabled : 0; $DKIMPrivateKeyFile = $obDomain->DKIMPrivateKeyFile; $DKIMSelector = $obDomain->DKIMSelector; $DKIMHeaderCanonicalizationMethod = $obDomain->DKIMHeaderCanonicalizationMethod; @@ -211,6 +213,7 @@ 'Sending MTA IP', 157 => 'Receiving IP', 158 => 'Receiving MX Hostname', - 159 => 'Failed Session Count', + 159 => 'Receiving MX HELO', + 160 => 'Failed Session Count', + 161 => 'Additional Information', + 162 => 'Failure Reason Code', 200 => 'Confirm delete', ); \ No newline at end of file From 92a5d7a9c27fae4c37e350b34eae99728e7db24d Mon Sep 17 00:00:00 2001 From: kimboslice99 <94807745+kimboslice99@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:08:10 -0500 Subject: [PATCH 19/34] update treemenu --- hMailAdmin/include_treemenu.php | 2 +- hMailAdmin/languages/english.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hMailAdmin/include_treemenu.php b/hMailAdmin/include_treemenu.php index 5ae3017..4a4795c 100644 --- a/hMailAdmin/include_treemenu.php +++ b/hMailAdmin/include_treemenu.php @@ -183,7 +183,7 @@
  • - TLS Reports +
    • 'Failed Session Count', 161 => 'Additional Information', 162 => 'Failure Reason Code', + 163 => 'TLS Reports', 200 => 'Confirm delete', ); \ No newline at end of file From 49ce68c883e2c3f270c76ebc58274df22b940aa1 Mon Sep 17 00:00:00 2001 From: kimboslice99 <94807745+kimboslice99@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:10:15 -0500 Subject: [PATCH 20/34] Update hm_tlsreports.php only show failure details header once. maybe add a break between each table --- hMailAdmin/hm_tlsreports.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hMailAdmin/hm_tlsreports.php b/hMailAdmin/hm_tlsreports.php index 6210cad..2113fd6 100644 --- a/hMailAdmin/hm_tlsreports.php +++ b/hMailAdmin/hm_tlsreports.php @@ -225,8 +225,8 @@ function parse($files){ -

    + From ef890808332fa89238587868fa735917bc6f0162 Mon Sep 17 00:00:00 2001 From: kimboslice99 <94807745+kimboslice99@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:55:19 -0500 Subject: [PATCH 21/34] nearly satisfied --- hMailAdmin/hm_tlsreports.php | 65 +++++++++++++++++++++----------- hMailAdmin/languages/english.php | 4 +- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/hMailAdmin/hm_tlsreports.php b/hMailAdmin/hm_tlsreports.php index 2113fd6..daf6ee9 100644 --- a/hMailAdmin/hm_tlsreports.php +++ b/hMailAdmin/hm_tlsreports.php @@ -93,9 +93,7 @@ function save_json_attachment($inbox, $email_number, $part, $index, $folder) { if (!is_dir($folder)) mkdir($folder); - // Assuming the attachment is already a JSON file $filename = str_replace('.gz', '', $filename); // Remove .gz extension if present - $filename = str_replace('.json.gz', '.json', $filename); if ($data = gzdecode($data)) { file_put_contents($folder . '/' . $filename, $data); } @@ -148,18 +146,20 @@ function parse($files){ if($('a.toggle').length){ $('a.toggle').on('click', function() { var id = $(this).attr('id'); + console.log('Toggle Clicked:', id); var sign = $(this).text(); if(sign == '+'){ - $('#' + id + '-d').show().find('div.hidden').slideDown(150); + $('#' + id + '-t').show().find('table.hidden').slideDown(150); $(this).text('-'); } else { - $('#' + id + '-d').find('div.hidden').slideUp(150,function(){$('#' + id + '-d').hide()}); + $('#' + id + '-t').hide().find('table.hidden').slideUp(150); $(this).text('+'); } return false; }) } }); +