amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-28 01:22:44 +00:00
Code Issues Projects Releases Wiki Activity

merge of '1f2eaa372e3ae66a929fc22a568735d95ec1f67f'

Browse Source 
and '1f953cea64fc6c840758f4cc35550f91b6aa07af'

Monotone-Parent: 1f2eaa372e3ae66a929fc22a568735d95ec1f67f
Monotone-Parent: 1f953cea64fc6c840758f4cc35550f91b6aa07af
Monotone-Revision: e3f12e7b1f3dbd033f9a9644cb66aff2e1661704

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-09-02T19:17:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-09-02 19:17:20 +00:00
parent 428b086ff8 eb506c6b0d
commit ebdf9419fe
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -7,6 +7,16 @@
* SoObjects/SOGo/NSDictionary+URL.m (-asURLParameters): escaped
keys and values using [NSString+misc stringByEscapingURL] from SOPE.
2010-09-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailView.m (_receiptMessageHeaderTo:): properly
escape the message subject in QP when needed.
* UI/WebServerResources/UIxMailEditor.js:
(onMenuCheckReturnReceipt): the function has an event parameter
which we need. This fixes an exception occurring when clicking the
"Options" menu.
2010-09-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tests/Unit/SOGoTest.m (-run): fixed build on GNUstep >= 1.20.

18
SoObjects/Mailer/SOGoMailAccount.m
View File

@@ -521,16 +521,13 @@ static NSString *sieveScriptName = @"sogo";
mailAccount = [self _mailAccount];
encryption = [mailAccount objectForKey: @"encryption"];
defaultPort = [[mailAccount objectForKey: @"port"] intValue];
defaultPort = 143;
protocol = @"imaps";
if (!defaultPort)
defaultPort = 143;
if ([encryption isEqualToString: @"ssl"] ||
[encryption isEqualToString: @"tls"])
protocol = @"imaps";
else
protocol = @"imap";
if ([encryption isEqualToString: @"ssl"])
defaultPort = 993;
else if (![encryption isEqualToString: @"tls"])
protocol = @"imap";
username = [mailAccount objectForKey: @"userName"];
escUsername
@@ -542,8 +539,9 @@ static NSString *sieveScriptName = @"sogo";
port = [[mailAccount objectForKey: @"port"] intValue];
if (port && port != defaultPort)
[imap4URLString appendFormat: @":%d", port];
[imap4URLString appendString: @"/"];
return imap4URLString;
}

2
SoObjects/Mailer/SOGoMailBaseObject.m
View File

@@ -198,7 +198,7 @@ static BOOL debugOn = YES;
urlString = [NSString stringWithFormat: @"%@?tls=YES",
[self imap4URLString]];
else
urlString = [self imap4URLString];
urlString = [self imap4URLString];
imap4URL = [[NSURL alloc] initWithString: urlString];
}

17
SoObjects/SOGo/SOGoUser.m
View File

@@ -534,22 +534,17 @@
port = [url port];
encryption = @"none";
port = @"143";
if ([url query] && [[url query] caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
encryption = @"tls";
if ([port intValue] == 0)
if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame &&
![encryption isEqualToString: @"tls"])
{
if (scheme)
{
if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame &&
![encryption isEqualToString: @"tls"])
{
encryption = @"ssl";
port = @"993";
}
}
encryption = @"ssl";
if ([port intValue] == 0)
port = @"993";
}
if ([url host])

3
UI/MailerUI/UIxMailView.m
View File

@@ -447,7 +447,8 @@ static NSString *mailETag = nil;
subject = [NSString stringWithFormat:
[self labelForKey: @"Return Receipt (displayed) - %@"],
[self messageSubject]];
[map setObject: subject forKey: @"subject"];
[map setObject: [subject asQPSubjectString: @"utf-8"]
forKey: @"subject"];
return map;
}

2
UI/PreferencesUI/UIxPreferences.h
View File

@@ -1,6 +1,6 @@
/* UIxPreferences.h - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
* Copyright (C) 2007-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*

2
UI/WebServerResources/UIxMailEditor.js
View File

@@ -450,7 +450,7 @@ function initializePriorityMenu() {
$(chosenNode).addClassName("_chosen");
}
function onMenuCheckReturnReceipt() {
function onMenuCheckReturnReceipt(event) {
event.cancelBubble = true;
this.enabled = !this.enabled;