jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Correctly handle blocklist and blocklist count

Browse Source
This commit is contained in:
Johannes Zellner
2025-06-13 22:30:46 +02:00
parent f3fc393617
commit a1c66e3808
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dashboard/src/views/EmailSettingsView.vue
View File

@@ -137,12 +137,20 @@ const spamFilterDialog = useTemplateRef('spamFilterDialog');
const spamFilterBusy = ref(false);
const spamFilterError = ref('');
const blocklist = ref([]);
const blocklistString = ref('');
const allowlist = ref([]);
const allowlistString = ref('');
const spamCustomConfig = ref('');
const blocklistCount = computed(() => {
return blocklist.value.filter(l => l.trim()).filter(l => l.indexOf('#') !== 0).length;
});
function onShowSpamFilterDialog() {
spamFilterError.value = '';
spamFilterBusy.value = false;
blocklistString.value = blocklist.value.join('\n');
allowlistString.value = allowlist.value.join('\n');
spamFilterDialog.value.open();
}
@@ -151,8 +159,8 @@ async function onSubmitSpamFilter() {
spamFilterError.value = '';
spamFilterBusy.value = true;
const block = blocklist.value.split('\n').filter((l) => { return l !== ''; });
const allow = allowlist.value.split('\n').filter((l) => { return l !== ''; });
const block = blocklistString.value.split('\n').filter((l) => { return l !== ''; });
const allow = allowlistString.value.split('\n').filter((l) => { return l !== ''; });
let [error] = await mailModel.setSpamAcl(allow, block);
if (error) {
@@ -170,8 +178,8 @@ async function onSubmitSpamFilter() {
spamFilterDialog.value.close();
blocklist.value = block.join('\n');
allowlist.value = allow.join('\n');
blocklist.value = block;
allowlist.value = allow;
spamFilterBusy.value = false;
}
@@ -212,8 +220,8 @@ onMounted(async () => {
[error, result] = await mailModel.spamAcl();
if (error) return console.error(error);
allowlist.value = result.allowlist.join('\n');
blocklist.value = result.blocklist.join('\n');
allowlist.value = result.allowlist;
blocklist.value = result.blocklist;
[error, result] = await mailModel.ftsConfig();
if (error) return console.error(error);
@@ -268,7 +276,7 @@ onMounted(async () => {
<FormGroup>
<label for="blocklistInput">{{ $t('emails.spamFilterDialog.blacklisteAddresses') }}</label>
<p class="small">{{ $t('emails.spamFilterDialog.blacklisteAddressesInfo') }}</p>
<textarea id="blocklistInput" v-model="blocklist" :placeholder="$t('emails.spamFilterDialog.blacklisteAddressesPlaceholder')" rows="4"></textarea>
<textarea id="blocklistInput" v-model="blocklistString" :placeholder="$t('emails.spamFilterDialog.blacklisteAddressesPlaceholder')" rows="4"></textarea>
</FormGroup>
<FormGroup>
@@ -349,7 +357,7 @@ onMounted(async () => {
<SettingsItem>
<FormGroup>
<label>{{ $t('emails.settings.spamFilter') }}</label>
<div>{{ $t('emails.settings.spamFilterOverview', { blacklistCount: blocklist.length }) }}</div>
<div>{{ $t('emails.settings.spamFilterOverview', { blacklistCount: blocklistCount }) }}</div>
</FormGroup>
<div style="display: flex; align-items: center">
<Button tool plain @click="onShowSpamFilterDialog()">{{ $t('main.dialog.edit') }}</Button>