mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-07 22:38:51 +00:00
Monotone-Parent: e99c77c0d8085a88b285c83c82ff1b9bde79649b
Monotone-Revision: e78701f2a9ac70c8cfcbbd5a275afacd0d2330ee Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-04-17T13:49:23 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,13 @@
|
||||
2007-04-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
|
||||
-iCalParticipantsAndResourcesStringFromQueryParameters]): removed
|
||||
method made useless by the programmatic handling of iCalendar
|
||||
objects.
|
||||
([UIxComponentEditor -iCalParticipantsStringFromQueryParameters]): idem.
|
||||
([UIxComponentEditor -iCalResourcesStringFromQueryParameters]): idem.
|
||||
([UIxComponentEditor -iCalStringFromQueryParameter:_qpformat:_format]): idem.
|
||||
|
||||
* UI/WebServerResources/MailerUI.js (initDnd): enable drag and
|
||||
drop on all folder nodes, not just on leaves.
|
||||
|
||||
|
||||
@@ -136,13 +136,6 @@
|
||||
- (BOOL) isWriteableClientObject;
|
||||
- (NSException *) validateObjectForStatusChange;
|
||||
|
||||
- (NSString *) iCalParticipantsAndResourcesStringFromQueryParameters;
|
||||
- (NSString *) iCalParticipantsStringFromQueryParameters;
|
||||
- (NSString *) iCalResourcesStringFromQueryParameters;
|
||||
- (NSString *) iCalStringFromQueryParameter: (NSString *) _qp
|
||||
format: (NSString *) _format;
|
||||
- (NSString *) iCalOrganizerString;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* UIXCOMPONENTEDITOR_H */
|
||||
|
||||
@@ -678,74 +678,65 @@
|
||||
: @"visibility: hidden;");
|
||||
}
|
||||
|
||||
- (NSString *) iCalParticipantsAndResourcesStringFromQueryParameters
|
||||
{
|
||||
NSString *s;
|
||||
// - (NSString *) iCalParticipantsAndResourcesStringFromQueryParameters
|
||||
// {
|
||||
// NSString *s;
|
||||
|
||||
s = [self iCalParticipantsStringFromQueryParameters];
|
||||
return [s stringByAppendingString:
|
||||
[self iCalResourcesStringFromQueryParameters]];
|
||||
}
|
||||
// s = [self iCalParticipantsStringFromQueryParameters];
|
||||
// return [s stringByAppendingString:
|
||||
// [self iCalResourcesStringFromQueryParameters]];
|
||||
// }
|
||||
|
||||
- (NSString *) iCalParticipantsStringFromQueryParameters
|
||||
{
|
||||
static NSString *iCalParticipantString = \
|
||||
@"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;CN=\"%@\":MAILTO:%@\r\n";
|
||||
// - (NSString *) iCalParticipantsStringFromQueryParameters
|
||||
// {
|
||||
// static NSString *iCalParticipantString = @"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;CN=\"%@\":MAILTO:%@\r\n";
|
||||
|
||||
return [self iCalStringFromQueryParameter: @"ps"
|
||||
format: iCalParticipantString];
|
||||
}
|
||||
// return [self iCalStringFromQueryParameter: @"ps"
|
||||
// format: iCalParticipantString];
|
||||
// }
|
||||
|
||||
- (NSString *) iCalResourcesStringFromQueryParameters
|
||||
{
|
||||
static NSString *iCalResourceString = \
|
||||
@"ATTENDEE;ROLE=NON-PARTICIPANT;CN=\"%@\":MAILTO:%@\r\n";
|
||||
// - (NSString *) iCalResourcesStringFromQueryParameters
|
||||
// {
|
||||
// static NSString *iCalResourceString = @"ATTENDEE;ROLE=NON-PARTICIPANT;CN=\"%@\":MAILTO:%@\r\n";
|
||||
|
||||
return [self iCalStringFromQueryParameter: @"rs"
|
||||
format: iCalResourceString];
|
||||
}
|
||||
// return [self iCalStringFromQueryParameter: @"rs"
|
||||
// format: iCalResourceString];
|
||||
// }
|
||||
|
||||
- (NSString *) iCalStringFromQueryParameter: (NSString *) _qp
|
||||
format: (NSString *) _format
|
||||
{
|
||||
AgenorUserManager *um;
|
||||
NSMutableString *iCalRep;
|
||||
NSString *s;
|
||||
// - (NSString *) iCalStringFromQueryParameter: (NSString *) _qp
|
||||
// format: (NSString *) _format
|
||||
// {
|
||||
// AgenorUserManager *um;
|
||||
// NSMutableString *iCalRep;
|
||||
// NSString *s;
|
||||
|
||||
um = [AgenorUserManager sharedUserManager];
|
||||
iCalRep = (NSMutableString *)[NSMutableString string];
|
||||
s = [self queryParameterForKey:_qp];
|
||||
if(s && [s length] > 0) {
|
||||
NSArray *es;
|
||||
unsigned i, count;
|
||||
// um = [AgenorUserManager sharedUserManager];
|
||||
// iCalRep = (NSMutableString *)[NSMutableString string];
|
||||
// s = [self queryParameterForKey:_qp];
|
||||
// if(s && [s length] > 0) {
|
||||
// NSArray *es;
|
||||
// unsigned i, count;
|
||||
|
||||
es = [s componentsSeparatedByString: @","];
|
||||
count = [es count];
|
||||
for(i = 0; i < count; i++) {
|
||||
NSString *email, *cn;
|
||||
// es = [s componentsSeparatedByString: @","];
|
||||
// count = [es count];
|
||||
// for(i = 0; i < count; i++) {
|
||||
// NSString *email, *cn;
|
||||
|
||||
email = [es objectAtIndex:i];
|
||||
cn = [um getCNForUID:[um getUIDForEmail:email]];
|
||||
[iCalRep appendFormat:_format, cn, email];
|
||||
}
|
||||
}
|
||||
return iCalRep;
|
||||
}
|
||||
|
||||
- (NSString *) iCalOrganizerString
|
||||
{
|
||||
return [NSString stringWithFormat: @"ORGANIZER;CN=\"%@\":MAILTO:%@\r\n",
|
||||
[self cnForUser], [self emailForUser]];
|
||||
}
|
||||
// email = [es objectAtIndex:i];
|
||||
// cn = [um getCNForUID:[um getUIDForEmail:email]];
|
||||
// [iCalRep appendFormat:_format, cn, email];
|
||||
// }
|
||||
// }
|
||||
// return iCalRep;
|
||||
// }
|
||||
|
||||
- (NSException *) validateObjectForStatusChange
|
||||
{
|
||||
id co;
|
||||
|
||||
co = [self clientObject];
|
||||
if (![co
|
||||
respondsToSelector: @selector(changeParticipationStatus:)])
|
||||
return [NSException exceptionWithHTTPStatus:400 /* Bad Request */
|
||||
if (![co respondsToSelector: @selector(changeParticipationStatus:)])
|
||||
return [NSException exceptionWithHTTPStatus: 400 /* Bad Request */
|
||||
reason:
|
||||
@"method cannot be invoked on the specified object"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user