mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Always allow raw editing of Sieve scripts
This commit is contained in:
parent
3ed7b53f68
commit
14ba459d46
20 changed files with 59 additions and 211 deletions
|
|
@ -161,83 +161,47 @@ class RemoteAdminFetch extends AbstractFetchRemote {
|
|||
});
|
||||
}
|
||||
|
||||
createOrUpdateDomain(
|
||||
fCallback,
|
||||
bCreate,
|
||||
sName,
|
||||
sIncHost,
|
||||
iIncPort,
|
||||
sIncSecure,
|
||||
bIncShortLogin,
|
||||
bUseSieve,
|
||||
sSieveAllowRaw,
|
||||
sSieveHost,
|
||||
iSievePort,
|
||||
sSieveSecure,
|
||||
sOutHost,
|
||||
iOutPort,
|
||||
sOutSecure,
|
||||
bOutShortLogin,
|
||||
bOutAuth,
|
||||
bOutPhpMail,
|
||||
sWhiteList
|
||||
) {
|
||||
createOrUpdateDomain(fCallback, oDomain) {
|
||||
this.defaultRequest(fCallback, 'AdminDomainSave', {
|
||||
Create: bCreate ? 1 : 0,
|
||||
Name: sName,
|
||||
Create: oDomain.edit() ? 0 : 1,
|
||||
Name: oDomain.name(),
|
||||
|
||||
IncHost: sIncHost,
|
||||
IncPort: iIncPort,
|
||||
IncSecure: sIncSecure,
|
||||
IncShortLogin: bIncShortLogin ? 1 : 0,
|
||||
IncHost: oDomain.imapServer(),
|
||||
IncPort: oDomain.imapPort(),
|
||||
IncSecure: oDomain.imapSecure(),
|
||||
IncShortLogin: oDomain.imapShortLogin() ? 1 : 0,
|
||||
|
||||
UseSieve: bUseSieve ? 1 : 0,
|
||||
SieveAllowRaw: sSieveAllowRaw ? 1 : 0,
|
||||
SieveHost: sSieveHost,
|
||||
SievePort: iSievePort,
|
||||
SieveSecure: sSieveSecure,
|
||||
UseSieve: oDomain.useSieve() ? 1 : 0,
|
||||
SieveHost: oDomain.sieveServer(),
|
||||
SievePort: oDomain.sievePort(),
|
||||
SieveSecure: oDomain.sieveSecure(),
|
||||
|
||||
OutHost: sOutHost,
|
||||
OutPort: iOutPort,
|
||||
OutSecure: sOutSecure,
|
||||
OutShortLogin: bOutShortLogin ? 1 : 0,
|
||||
OutAuth: bOutAuth ? 1 : 0,
|
||||
OutUsePhpMail: bOutPhpMail ? 1 : 0,
|
||||
OutHost: oDomain.smtpServer(),
|
||||
OutPort: oDomain.smtpPort(),
|
||||
OutSecure: oDomain.smtpSecure(),
|
||||
OutShortLogin: oDomain.smtpShortLogin() ? 1 : 0,
|
||||
OutAuth: oDomain.smtpAuth() ? 1 : 0,
|
||||
OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0,
|
||||
|
||||
WhiteList: sWhiteList
|
||||
WhiteList: oDomain.whiteList()
|
||||
});
|
||||
}
|
||||
|
||||
testConnectionForDomain(
|
||||
fCallback,
|
||||
sName,
|
||||
sIncHost,
|
||||
iIncPort,
|
||||
sIncSecure,
|
||||
bUseSieve,
|
||||
sSieveHost,
|
||||
iSievePort,
|
||||
sSieveSecure,
|
||||
sOutHost,
|
||||
iOutPort,
|
||||
sOutSecure,
|
||||
bOutAuth,
|
||||
bOutPhpMail
|
||||
) {
|
||||
testConnectionForDomain(fCallback, oDomain) {
|
||||
this.defaultRequest(fCallback, 'AdminDomainTest', {
|
||||
Name: sName,
|
||||
IncHost: sIncHost,
|
||||
IncPort: iIncPort,
|
||||
IncSecure: sIncSecure,
|
||||
UseSieve: bUseSieve ? 1 : 0,
|
||||
SieveHost: sSieveHost,
|
||||
SievePort: iSievePort,
|
||||
SieveSecure: sSieveSecure,
|
||||
OutHost: sOutHost,
|
||||
OutPort: iOutPort,
|
||||
OutSecure: sOutSecure,
|
||||
OutAuth: bOutAuth ? 1 : 0,
|
||||
OutUsePhpMail: bOutPhpMail ? 1 : 0
|
||||
Name: oDomain.name(),
|
||||
IncHost: oDomain.imapServer(),
|
||||
IncPort: oDomain.imapPort(),
|
||||
IncSecure: oDomain.imapSecure(),
|
||||
UseSieve: oDomain.useSieve() ? 1 : 0,
|
||||
SieveHost: oDomain.sieveServer(),
|
||||
SievePort: oDomain.sievePort(),
|
||||
SieveSecure: oDomain.sieveSecure(),
|
||||
OutHost: oDomain.smtpServer(),
|
||||
OutPort: oDomain.smtpPort(),
|
||||
OutSecure: oDomain.smtpSecure(),
|
||||
OutAuth: oDomain.smtpAuth() ? 1 : 0,
|
||||
OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue