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

Monotone-Parent: bdcb6ad871c4f64f332f1638d6b0737b78b9a6a7

Browse Source 
Monotone-Revision: 009835d66e03b894b731fe8bbbadabcc4ca55605

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-27T21:26:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-27 21:26:44 +00:00
parent d419c8de74
commit a8e5b93d84
2 changed files with 104 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2007-06-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailListView.m ([UIxMailListView -sleep]):
removed method.
([-setQualifier:_msg], [-qualifier]): removed methods.
([UIxMailListView -defaultAction]): added code to handle the
search criteria and value passed as url parameters. Also, we now
handle the same search criterias as Thunderbird/Icedove.
2007-06-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/PreferencesUI/UIxJSONPreferences.m ([UIxJSONPreferences
UI/MailerUI/UIxMailListView.m
+95 -60
View File
@@ -36,6 +36,8 @@
#import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSString+misc.h>
#import <EOControl/EOQualifier.h>
#import <SoObjects/Mailer/SOGoMailFolder.h>
#import <SoObjects/Mailer/SOGoMailObject.h>
#import <SoObjects/SOGo/SOGoDateFormatter.h>
@@ -48,38 +50,42 @@ static int attachmentFlagSize = 8096;
@implementation UIxMailListView
- (id) init
{
SOGoUser *user;
if ((self = [super init]))
{
qualifier = nil;
user = [context activeUser];
ASSIGN (dateFormatter, [user dateFormatterInContext: context]);
ASSIGN (userTimeZone, [user timeZone]);
}
return self;
}
- (void) dealloc
{
[self->qualifier release];
[self->sortedUIDs release];
[self->messages release];
[self->message release];
[qualifier release];
[sortedUIDs release];
[messages release];
[message release];
[dateFormatter release];
[userTimeZone release];
[super dealloc];
}
/* notifications */
- (void) sleep
{
[self->qualifier release]; self->qualifier = nil;
[self->sortedUIDs release]; self->sortedUIDs = nil;
[self->messages release]; self->messages = nil;
[self->message release]; self->message = nil;
[super sleep];
}
/* accessors */
- (void)setMessage:(id)_msg
- (void) setMessage: (id) _msg
{
ASSIGN(self->message, _msg);
ASSIGN(message, _msg);
}
- (id) message
{
return self->message;
return message;
}
- (NSString *) messageDate
@@ -92,16 +98,6 @@ static int attachmentFlagSize = 8096;
return [dateFormatter formattedDateAndTime: messageDate];
}
- (void) setQualifier: (EOQualifier *) _msg
{
ASSIGN(self->qualifier, _msg);
}
- (EOQualifier *) qualifier
{
return self->qualifier;
}
- (BOOL) showToAddress
{
NSString *ftype;
@@ -227,9 +223,9 @@ static int attachmentFlagSize = 8096;
- (NSRange) fetchRange
{
if (self->firstMessageNumber == 0)
if (firstMessageNumber == 0)
return NSMakeRange(0, messagesPerPage);
return NSMakeRange(self->firstMessageNumber - 1, messagesPerPage);
return NSMakeRange(firstMessageNumber - 1, messagesPerPage);
}
- (NSArray *) sortedUIDs
@@ -237,17 +233,17 @@ static int attachmentFlagSize = 8096;
if (!sortedUIDs)
{
sortedUIDs
= [[self clientObject] fetchUIDsMatchingQualifier: [self qualifier]
sortOrdering: [self imap4SortOrdering]];
= [[self clientObject] fetchUIDsMatchingQualifier: qualifier
sortOrdering: [self imap4SortOrdering]];
[sortedUIDs retain];
}
return self->sortedUIDs;
return sortedUIDs;
}
- (unsigned int) totalMessageCount
{
return [self->sortedUIDs count];
return [sortedUIDs count];
}
- (BOOL) showsAllMessages
@@ -330,16 +326,9 @@ static int attachmentFlagSize = 8096;
NSArray *msgs;
NSRange r;
unsigned len;
SOGoUser *user;
if (self->messages != nil)
return self->messages;
user = [context activeUser];
if (!dateFormatter)
dateFormatter = [user dateFormatterInContext: context];
if (!userTimeZone)
ASSIGN (userTimeZone, [user timeZone]);
if (messages != nil)
return messages;
r = [self fetchBlock];
uids = [self sortedUIDs];
@@ -347,9 +336,10 @@ static int attachmentFlagSize = 8096;
/* only need to restrict if we have a lot */
uids = [uids subarrayWithRange:r];
msgs = [[self clientObject] fetchUIDs:uids parts:[self fetchKeys]];
self->messages = [[msgs valueForKey:@"fetch"] retain];
return self->messages;
msgs = [[self clientObject] fetchUIDs:uids parts: [self fetchKeys]];
messages = [[msgs valueForKey:@"fetch"] retain];
return messages;
}
/* URL processing */
@@ -473,17 +463,57 @@ static int attachmentFlagSize = 8096;
return firstMessage;
}
- (void) _setQualifierForCriteria: (NSString *) criteria
andValue: (NSString *) value
{
[qualifier release];
if ([criteria isEqualToString: @"subject"])
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"(subject doesContain: %@)",
value];
else if ([criteria isEqualToString: @"sender"])
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"(from doesContain: %@)",
value];
else if ([criteria isEqualToString: @"subject_or_sender"])
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"(subject doesContain: %@) OR "
@"(from doesContain: %@)",
value, value];
else if ([criteria isEqualToString: @"to_or_cc"])
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"(to doesContain: %@) OR "
@"(cc doesContain: %@)",
value, value];
else if ([criteria isEqualToString: @"entire_message"])
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"(message doesContain: %@)",
value];
else
qualifier = nil;
[qualifier retain];
}
- (id) defaultAction
{
WORequest *request;
NSString *specificMessage;
NSString *specificMessage, *searchCriteria, *searchValue;
request = [[self context] request];
[[self clientObject] flushMailCaches];
specificMessage = [request formValueForKey: @"pageforuid"];
self->firstMessageNumber
searchCriteria = [request formValueForKey: @"search"];
searchValue = [request formValueForKey: @"value"];
if ([searchCriteria length] > 0
&& [searchValue length] > 0)
[self _setQualifierForCriteria: searchCriteria
andValue: searchValue];
firstMessageNumber
= ((specificMessage)
? [self firstMessageOfPageFor: [specificMessage intValue]]
: [[request formValueForKey:@"idx"] intValue]);
@@ -550,19 +580,24 @@ static int attachmentFlagSize = 8096;
{
// TODO: we might want to flush the caches?
NSException *error;
id client;
id clientObject;
clientObject = [self clientObject];
if (clientObject)
{
error = [clientObject expunge];
if (!error)
{
if ([clientObject respondsToSelector: @selector(flushMailCaches)])
[clientObject flushMailCaches];
return [self redirectToLocation:@"view"];
}
}
else
error = [NSException exceptionWithHTTPStatus:404 /* Not Found */
reason: @"did not find mail folder"];
if ((client = [self clientObject]) == nil) {
return [NSException exceptionWithHTTPStatus:404 /* Not Found */
reason:@"did not find mail folder"];
}
if ((error = [[self clientObject] expunge]) != nil)
return error;
if ([client respondsToSelector:@selector(flushMailCaches)])
[client flushMailCaches];
return [self redirectToLocation:@"view"];
return error;
}
@end