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

propagate from branch 'ca.inverse.sogo.1_3_10' (head 00afe1e795cd37cafff7687d6f1b8502f4f5735e)

Browse Source 
to branch 'ca.inverse.sogo' (head dd0644b62704e75dfed8a39a7e286d593f0014e0)

Monotone-Parent: 00afe1e795cd37cafff7687d6f1b8502f4f5735e
Monotone-Parent: dd0644b62704e75dfed8a39a7e286d593f0014e0
Monotone-Revision: 6927dc6b0ecbc6c5c3061a56fd1e91ef658279ae

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-11-17T19:08:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-11-17 19:08:52 +00:00
parent 88d818df1a cb4341db75
commit 01be7b7d8f
45 changed files with 12354 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoGCSFolder.m
+2 -2
View File
@@ -1986,7 +1986,7 @@ static NSArray *childRecordFields = nil;
[r appendFormat: @"<D:response><D:href>"];
[r appendString: baseURL];
[r appendString: [object objectForKey: @"c_name"]];
[r appendString: [[object objectForKey: @"c_name"] stringByEscapingURL]];
[r appendString: @"</D:href>"];
// NSLog (@"(appendPropstats...): %@", [NSDate date]);
@@ -2032,7 +2032,7 @@ static NSArray *childRecordFields = nil;
for (count = 0; count < max; count++)
{
element = [refs objectAtIndex: count];
currentURL = [[element firstChild] nodeValue];
currentURL = [[[element firstChild] nodeValue] stringByUnescapingURL];
[urls addObject: currentURL];
}
SoObjects/SOGo/SOGoSieveManager.m
+20 -2
View File
@@ -629,7 +629,7 @@ static NSString *sieveScriptName = @"sogo";
NGSieveClient *client;
NSString *filterScript, *v, *sieveServer;
int sievePort;
BOOL b;
BOOL b, connected;
dd = [user domainDefaults];
if (!([dd sieveScriptsEnabled] || [dd vacationEnabled] || [dd forwardEnabled]))
@@ -637,6 +637,8 @@ static NSString *sieveScriptName = @"sogo";
req = [NSMutableArray arrayWithCapacity: 15];
ud = [user userDefaults];
connected = YES;
b = NO;
script = [NSMutableString string];
@@ -793,7 +795,23 @@ static NSString *sieveScriptName = @"sogo";
[client closeConnection];
return NO;
}
result = [client login: theLogin authname: theAuthName password: thePassword];
NS_DURING
{
result = [client login: theLogin authname: theAuthName password: thePassword];
}
NS_HANDLER
{
connected = NO;
}
NS_ENDHANDLER
if (!connected)
{
NSLog(@"Sieve connection failed on %@", [address description]);
return NO;
}
if (![[result valueForKey:@"result"] boolValue]) {
NSLog(@"failure. Attempting with a renewed password (no authname supported)");
thePassword = [theAccount imap4PasswordRenewed: YES];