diff --git a/emailPremium/views.py b/emailPremium/views.py index 734a45dac..bbc21333d 100755 --- a/emailPremium/views.py +++ b/emailPremium/views.py @@ -1449,13 +1449,20 @@ def fetchRspamdSettings(request): postdata = ProcessUtilities.outputExecutioner(command).splitlines() for i in postdata: - if i.find('smtpd_milters=') > -1 and i.find('non_smtpd_milters') < 0: + if (i.find('smtpd_milters=') > -1 or i.find('smtpd_milters =') > -1) and i.find('non_smtpd_milters') < 0: ### non_smtpd_milters = inet:127.0.0.1:8891, inet:127.0.0.1:11332 - tempData = i.split(',') - smtpd_milters = tempData[1].lstrip(' ') - if i.find('non_smtpd_milters=') > -1: - tempData = i.split('=') - non_smtpd_milters = tempData[1].lstrip(' ') + tempData = i.split(',')[1] + if os.path.exists(ProcessUtilities.debugPath): + logging.CyberCPLogFileWriter.writeToFile(f'smtpd_milters: {tempData}') + smtpd_milters = tempData.lstrip(' ') + if i.find('non_smtpd_milters=') > -1 or i.find('non_smtpd_milters =') > -1: + tempData = i.split('=')[1] + + if os.path.exists(ProcessUtilities.debugPath): + logging.CyberCPLogFileWriter.writeToFile(f'non_smtpd_milters: {tempData}') + + non_smtpd_milters = tempData.lstrip(' ') + ###Redis Redispath = "/etc/rspamd/local.d/redis.conf" diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index c98d4b00b..3d8962df0 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -1028,10 +1028,10 @@ LogFile /var/log/clamav/clamav.log writeDataToFile = open(postfixpath, "w") for i in data: - if i.find('smtpd_milters=') > -1 and i.find('non_smtpd_milters') < 0: - newitem = f'non_smtpd_milters = inet:127.0.0.1:8891, {smtpd_milters}\n' + if (i.find('smtpd_milters=') > -1 or i.find('smtpd_milters =') > -1) and i.find('non_smtpd_milters') < 0: + newitem = f'smtpd_milters = inet:127.0.0.1:8891, {smtpd_milters}\n' writeDataToFile.writelines(newitem + '\n') - elif i.find('non_smtpd_milters=') > -1: + elif i.find('non_smtpd_milters=') > -1 or i.find('non_smtpd_milters =') > -1: #newitem = 'non_smtpd_milters=%s' % non_smtpd_milters writeDataToFile.writelines('non_smtpd_milters = $smtpd_milters\n') else: