Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-11 07:46:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix and finalize https://github.com/usmannasir/cyberpanel/issues/1176

Browse Source
This commit is contained in:
usmannasir
2024-01-13 11:38:22 +05:00
parent 81a531b1a9
commit a99c1fae16
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emailPremium/views.py
View File

@@ -1449,13 +1449,20 @@ def fetchRspamdSettings(request):
postdata = ProcessUtilities.outputExecutioner(command).splitlines() postdata = ProcessUtilities.outputExecutioner(command).splitlines()
for i in postdata: 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 ### non_smtpd_milters = inet:127.0.0.1:8891, inet:127.0.0.1:11332
tempData = i.split(',') tempData = i.split(',')[1]
smtpd_milters = tempData[1].lstrip(' ') if os.path.exists(ProcessUtilities.debugPath):
if i.find('non_smtpd_milters=') > -1: logging.CyberCPLogFileWriter.writeToFile(f'smtpd_milters: {tempData}')
tempData = i.split('=') smtpd_milters = tempData.lstrip(' ')
non_smtpd_milters = tempData[1].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 ###Redis
Redispath = "/etc/rspamd/local.d/redis.conf" Redispath = "/etc/rspamd/local.d/redis.conf"

6
plogical/mailUtilities.py
View File

@@ -1028,10 +1028,10 @@ LogFile /var/log/clamav/clamav.log
writeDataToFile = open(postfixpath, "w") writeDataToFile = open(postfixpath, "w")
for i in data: for i in data:
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:
newitem = f'non_smtpd_milters = inet:127.0.0.1:8891, {smtpd_milters}\n' newitem = f'smtpd_milters = inet:127.0.0.1:8891, {smtpd_milters}\n'
writeDataToFile.writelines(newitem + '\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 #newitem = 'non_smtpd_milters=%s' % non_smtpd_milters
writeDataToFile.writelines('non_smtpd_milters = $smtpd_milters\n') writeDataToFile.writelines('non_smtpd_milters = $smtpd_milters\n')
else: else: