amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-05 20:10:33 +00:00
Code Issues Projects Releases Wiki Activity

feat(accounts): Can now add smtp server to auxilliary accounts

Browse Source
This commit is contained in:
Hivert Quentin
2024-02-08 17:07:25 +01:00
parent f5cd67972b
commit adc2d74e54
9 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+22 -7
View File
@@ -2280,9 +2280,11 @@ static NSString *userAgent = nil;
SOGoDomainDefaults *dd;
NSURL *sourceIMAP4URL, *smtpUrl;
NSException *error;
NSString *userId;
dd = [[context activeUser] domainDefaults];
messageForSent = nil;
userId = [[self->container mailAccountFolder] nameInContainer];
// If we are encrypting mails, let's generate and
// send them individually
@@ -2311,7 +2313,7 @@ static NSString *userAgent = nil;
if (smtpUrl)
{
error = [[SOGoMailer mailerWithDomainDefaultsAndSmtpUrl: dd smtpUrl: smtpUrl]
error = [[SOGoMailer mailerWithDomainDefaultsAndSmtpUrl: dd smtpUrl: smtpUrl userIdAccount: userId]
sendMailData: message
toRecipients: [NSArray arrayWithObject: recipient]
sender: [self sender]
@@ -2352,13 +2354,26 @@ static NSString *userAgent = nil;
smtpUrl = [self smtp4URL];
error = [[SOGoMailer mailerWithDomainDefaultsAndSmtpUrl: dd smtpUrl: smtpUrl]
sendMailData: message
toRecipients: [self allBareRecipients]
sender: [self sender]
if (smtpUrl)
{
error = [[SOGoMailer mailerWithDomainDefaultsAndSmtpUrl: dd smtpUrl: smtpUrl userIdAccount: userId]
sendMailData: message
toRecipients: [self allBareRecipients]
sender: [self sender]
withAuthenticator: [self authenticatorInContext: context]
inContext: context
systemMessage: NO];
inContext: context
systemMessage: NO];
}
else
{
error = [[SOGoMailer mailerWithDomainDefaults: dd]
sendMailData: message
toRecipients: [self allBareRecipients]
sender: [self sender]
withAuthenticator: [self authenticatorInContext: context]
inContext: context
systemMessage: NO];
}
}
if (!error && copyToSent)